Merge branch 'main' of gitlab.tudelft.nl:mude/2024-website

_announcements/_week-1.md

+---
+title: Welcome, Website is Live!
+week: 0
+date: 2024-09-03
+---
+
+Welcome to MUDE: Modelling, Uncertainty, and Data Analysis for Engineers!
+
+This is an announcement.
\ No newline at end of file

_announcements/week-0.md

+---
+title: Welcome, Website is Live!
+week: 0
+date: 2024-09-03
+---
+
+Welcome to MUDE: Modelling, Uncertainty, and Data Analysis for Engineers!
+
+This is an announcement, which will typically duplicate those provided on Brightspace.
+
+The next announcement will happen after the first lecture is finished. For now, feel free to exlpore the MUDE website to learn more about the module.
+
+<!-- Make sure that you fill out the survey as soon as possible! -->
\ No newline at end of file

_config_draft.yml

@@ -46,9 +46,11 @@ aux_links:
   Answers:
     - "https://answers.citg.tudelft.nl"
   Files:
-    - "https://mude.citg.tudelft.nl/course-files/"
+    - "https://mude.citg.tudelft.nl/files/"
   Textbook:
     - "https://mude.citg.tudelft.nl/book"
+  Home:
+    - "https://mude.citg.tudelft.nl"
 aux_links_new_tab: true
 
 # Collections for website data

_includes/footer_custom.html

@@ -8,7 +8,7 @@
     width: auto;
   }
   .footer-logo img.mude {
-    height: 20px;
+    height: 35px;
     width: auto;
     margin-left: 15px;
   }

_staffers/gui.md

+---
+name: Gui Alvarenga
+role: Teaching Assistant
+email: g.ferreirasecodealvarenga@student.tudelft.nl
+photo: Gui.jpg
+---
+
+Civil Engineering / Geoscience & Remote Sensing
\ No newline at end of file

_staffers/isabel.md

+---
+name: Isabel Slingerland
+role: Teaching Assistant
+email: I.C.SLingerland-1@student.tudelft.nl
+photo: Isabel.jpeg
+---
+Civil Engineering / Geoscience & Remote Sensing
\ No newline at end of file

_staffers/mohammed.md

+---
+name: Mohammed Shomis
+role: Teaching Assistant
+email: M.S.A.Shomis@student.tudelft.nl
+photo: Mohammed.JPG
+---
+
+Computer Science / Software Development

announcements.md

+---
+layout: page
+title: All Announcements
+description: A feed containing all of the class announcements.
+nav_order: 4
+nav_exclude: false
+---
+
+# Announcements
+
+{% assign announcements = site.announcements | reverse %}
+{% for announcement in announcements %}
+{{ announcement }}
+{% endfor %}

exams.md

@@ -51,17 +51,17 @@ Where changes have been made, an indication is provided for which questions in e
 
 ### Detailed Overview of Changes from Previous Years
 
-The purpose of this section is to help you determine which exam questions from the sample exams are relevant for you this year. You are not expected to study the changes in MUDE contentss from year to year.
+The purpose of this section is to help you determine which exam questions from the sample exams are relevant for you this year. You are not expected to study the changes in MUDE contents from year to year.
 
 The biggest change was between the 2022-2023 and 2023-2024 academic years. Specific differences include:
 - Inclusion of one week of finite volume method.
 - Finite difference no longer included in study material for Q2 (now in Q1).
 - Finite element material is reduced, relative to 2022.
-- Extreme value analysis is material is in Q2, but you have already covered it in Q1 of 2022.   
+- Extreme value analysis is material is expanded and now in Q2 instead of Q1.
 
 Please also keep in mind the following when using the exams from 2022-2023:
-- Tthere were around 8 or 9 "Questions" on the exam, each with multiple sub-questions. This year there will be fewer "Questions," which of course means the value (in points) will be more for each of them.
+- There were around 8 or 9 "Questions" on the exam, each with multiple sub-questions. This year there will be fewer "Questions," which of course means the value (in points) will be more for each of them.
 - The style of questions in the sample exams is representative of the style of questions you will see this year.
-- Some questions or portions of questions may make reference to topics that have not been covered in the current academic year. For example, 'W-test' in sensing in observation theory was not covered, so you may exclude this topic for your studies.
+- Some questions or portions of questions may make reference to topics that have not been covered in the current academic year. For example, 'W-test' in sensing and observation theory was not covered, so you may exclude this topic for your studies.
 - The scope of the exam is governed by the contents of the online textbook, and exceptions are stated in the book. If you see a discrepancy between the textbook and the sample exams, the textbook governs.
 - A portion of the questions this year will take inspiration from the assignments we have done on Wednesday and Friday (but not all of the questions); it would be wise to review this when preparing for the exam.
\ No newline at end of file

home.md

@@ -20,17 +20,19 @@ MUDE is a module at the Civil Engineering and Geosciences faculty of Delft Unive
 
 *This page shows the most recent announcement and calendar. Frequently used pages are found via the links at the top right.*
 
-*See [Calendar](/2023/calendar) and [Weekly Schedule]({{ site.baseurl }}/schedule) for additional explanation.*
+*See [Weekly Schedule]({{ site.baseurl }}/schedule) for additional explanation.*
 
 ### Most recent announcement
 
+*A record of previous announcements can be found on the [All Announcements page]({{ site.baseurl }}/announcements).*
+
 {% if site.announcements %}
 {{ site.announcements.last }}
 [Previous Announcements](announcements){: .btn .btn-outline .fs-3 }
 {% endif %}
 
 
-### Calendar for this week
-
-{{ site.modules.first }}
-[Previous Calendars](calendar){: .btn .btn-outline .fs-3 }
\ No newline at end of file
+<!-- ### Calendar for this week -->
+<!--  -->
+<!-- {{ site.modules.first }} -->
+<!-- [Previous Calendars](calendar){: .btn .btn-outline .fs-3 } -->
\ No newline at end of file

info.md

@@ -15,9 +15,9 @@ An overview of the module and some key policies are described on this page, addi
 
 _Updates to the material on this page will be accompanied by announcements in class during the Monday lectures and and via the [Announcements](../announcements/) page on this website._
 
-MUDE is built on a repetetive and consistent weekly schedule, which is illustrated on the [Schedule page](../schedule), along with a list of topics, by week.
+MUDE is built on a repetitive and consistent weekly schedule, which is illustrated on the [Schedule page](../schedule), along with a list of topics, by week.
 
-If the information below does not answer your question, firt check the [Answers Platform](https://answers.citg.tudelft.nl/){:target="_blank"} (described [below](#answers-platform)). If that doesn't help, you can contact MUDE staff at MUDE-CEG@tudelft.nl.
+If the information below does not answer your question, first check the [Answers Platform](https://answers.citg.tudelft.nl/){:target="_blank"} (described [below](#answers-platform)). If that doesn't help, you can contact MUDE staff at MUDE-CEG@tudelft.nl.
 
 This page contains the following sections:
 - [Module Information](#module-information)
@@ -51,13 +51,13 @@ There are three types of assignments every week, each of which is described belo
 - **Workshops (WS)**: assigned and completed during Wednesday sessions. _Not_ part of Assignment Portfolio grade.
 - **Group Assignments (GA)**: completed in groups during Friday sessions. Part of Assignment Portfolio grade.
 
-Assignments (and weeks) are numbered to indicate the quarter and week in which they occur. For example, PA 1.4 is the Programming Assignment for week 4 in quarter 2. Files and folders will use an underscore, for example `PA_1_4_*.ipynb` will be stored in folder `Week_1_4`.
+Assignments (and weeks) are numbered to indicate the quarter and week in which they occur. For example, PA 1.4 is the Programming Assignment for week 4 in quarter 1. Files and folders will use an underscore, for example `PA_1_4_*.ipynb` will be stored in folder `Week_1_4`.
 
 GitLab will be used to submit PA's and GA's and to recieve feedback from instructors. Instructions for how to access and use GitLab will be provided over the first two weeks of Q1.
 
 ## Weekly Schedule
 
-Each week begins with a lecture on Monday and ends with a Group Assignment completed in-class on a Friday; question hours, Programming Assignments and Wednesday Workshops are designed to help you learn the topic for each week in a structured and way that is repeated each week. See the [weekly schedule page](../shedule) for an illustration.
+Each week begins with a lecture on Monday (except Week 1.1, which is on Tuesday!) and ends with a Group Assignment completed in-class on a Friday; question hours, Programming Assignments and Wednesday Workshops are designed to help you learn the topic for each week in a structured way that is repeated each week. See the [weekly schedule page](../shedule) for an illustration.
 
 ### In-Class Sessions
 
@@ -82,6 +82,7 @@ There are several online resources for this module, most of which are available
 - **GitLab**: starting in week 3 this will be our primary platform for sharing and submitting assignments, as well as receiving feedback. In Weeks 1 and 2 you will download your assignments from GitLab, but not submit them.
 - **Collegerama**: Our Monday lectures are available to stream online [here](https://collegeramavideoportal.tudelft.nl/catalogue/cegm1000/?academicYear=2024-2025-cegm1000).
 - **Brightspace:** annoucements and BuddyCheck. To make sure you never miss an announcement, get the Pulse app! An overview with instructions can be found [here](https://teaching-support.tudelft.nl/how-to-use-pulse/).
+- **BuddyCheck:** A peer feedback tool that will be completed on a weekly bases to monitor your group and improve your ability to work together. Described in detail on the [Assignment Portfolio page](./portfolio).
 
 Please note that content in the online textbook will be added on a weekly basis throughout the module, and changes will be announced and documented as needed. When new content is added, it will be done in large chunks. Changes will not be made retroactively that impact the scope of the exams (in other words, you will never need to re-study material because it changed prior to the exam). Notifications of errors, corrections and suggestions for improvement are glady welcomed via the Answers platform and/or via the MUDE email address.
 
@@ -91,7 +92,7 @@ The [Answers Platform](https://answers.citg.tudelft.nl/){:target="_blank"} is a
 
 The platform works by providing (and discussing) answers to questions, then voting whether or not you find the answer to be useful. You can also track statistics as you participate in the platform, giving it a bit of a competitive side: we will be periodically awarding prizes to students who make exceptional contributions to the Answers platform throughout the semester! In addition, this is also a useful metric we have for selecting future MUDE TA's.
 
-There are numerous benefits for sharing our questions and answers on this platform. To ensure it becomes a useful resource, please consdier the following guidelines:
+There are numerous benefits for sharing our questions and answers on this platform. To ensure it becomes a useful resource, please consider the following guidelines:
 1. Questions and answers should be written as if they were a standalone document. You should not use it as if it were a WhatsApp or email conversation.
 2. Add a vote if something is useful or not. If you like a question or answer, give it an upvote! Downvotes are also informative (try to use the comment thread to indicate why).
 3. Edit your posts instead of adding a second post with a correction. Use the comment thread to discuss or explain confusion.

multiyear.md

@@ -29,4 +29,8 @@ If you completed the projects from previous years and recieved passing grades fo
 
 If you only completed (or passed) part of the project assignments from a previous year, you must repeat the present year portfolio assignments for that quarter.
 
-Students from previous years that must finish the portfolio assignments from this year must also complete the programming assignments. BuddyChecks are not required if you complete the assignments individually (but we recommend you work with a group, if possible!). Please consult MUDE staff to arrange this. 
\ No newline at end of file
+Students from previous years that must finish the portfolio assignments from this year must also complete the programming assignments. BuddyChecks are not required if you complete the assignments individually (but we recommend you work with a group, if possible!). Please consult MUDE staff to arrange this. 
+
+## Students from 2022-2023
+
+If you are collaborating with students from this year on the Group Assignment, we recommend you review the Programming Assignments that focus on Git and collaboration, PA 1.3 and PA 1.4. This is especially true if you are participating in Q2 Assignment Portfolio work, as the material from Q2 builds on the PA's from Q1.
\ No newline at end of file

portfolio.md

@@ -7,147 +7,100 @@ nav_exclude: false
 permalink: /portfolio/
 # math: mathjax
 ---
-# Group Assignments
 
-Overview of projects and module policies for report writing, directory structure and code documentation.
+# Assignment Portfolio
 
-Group Assignments consist of the following elements:
-1. A set of digitial files in the form of a working directory that you work on with your group members and submit every Friday at the end of the in-class sessions.
+The Assignment Portfolio consists of three things: Programming Assignments, BuddyChecks and Group Assignments. As such, it is based on individual and group work.
+
+In particular, the Group Assignments consist of the following weekly elements:
+1. A set of digitial files that you submit every Friday at the end of the in-class sessions (except Weeks 1.2 and 1.3).
 2. BuddyCheck, a weekly questionnaire administered via Brightspace to evaluate yourself and your group members.
 3. Weekly reflections to improve the performance of your group and keep issues from becoming serious; recommended to occur at the beginning of the Wednesday in-class sessions, but this can be flexible.  
 
+Key components of the Assignment Portfolio are described below.
 
-
-
-
+This page contains the following sections:
+- [Assignment Portfolio](#assignment-portfolio)
+  - [Programming Assignments (PA)](#programming-assignments-pa)
+  - [Peer Feedback with Buddycheck](#peer-feedback-with-buddycheck)
+  - [Group Assignments](#group-assignments)
+  - [Grading Criteria: Assignment Portfolio](#grading-criteria-assignment-portfolio)
+  - [Procedures and Conduct](#procedures-and-conduct)
+    - [As a Group](#as-a-group)
+    - [As an Individual Student](#as-an-individual-student)
 
 ## Programming Assignments (PA)
 
-A Programming Assignment is provided each week to introduce a few relevant concepts that are expected to be applied directly in the Group Assignment for that week. Programming Assignments are automatically graded after submitting them to GitLab and are assessed on a pass/no pass basis. You may resubmit as many times as needed to pass the assignment before the deadline at the end of each quarter (see the [Assignment Portfolio page](../portfolio) for deadlines).
+A Programming Assignment is provided each week to introduce a few relevant concepts that are expected to be applied directly in the Group Assignment for that week. Programming Assignments are automatically graded after submitting them to GitLab and are assessed on a pass/no pass basis. You may resubmit as many times as needed to pass the assignment before the deadline at the end of each quarter.
 
 You do not have to submit PA 1.1 and 1.2.
 
-<!-- We will use a _static check_ to evaluate your work on a regular basis. This involves the teaching team making a clone of your repository and checking to see if you have met a few basic requirements. For example, did you use the right file name, and does your notebook run without error? These criteria will be specified for each assignment, and if you did not meet the criteria, you will get a report in a `static_check.md` file notifying you of any issues. We will make every attempt to run the static checks for the Programming Assignments every Monday, Wednesday and Friday at 8:45; however, depending on personnel, the times will be somewhat irregular. For practical purposes, you can assume that if your assignment is ready by 8:45 on Monday, Wednesday or Friday it will be checked by the end of the day. -->
-
-<!-- All Programming Assignments for a given quarter will be checked on Monday, Wednesday and Friday, until the last check of the quarter, which will be the **Monday of week 9**. At this point, you will get full credit (2.5 pts) for all Programming Assignments that have passed the static check. See the point breakdown on the [Project page](../projects) for how the Programming Assignments are included in the Project Portfolio. -->
-
-<!-- **Note about deadlines:** the times specified for the static are the _earliest_ time at which we will collect your work; it is your responsibility to make sure that your work is pushed to GitLab by this time, or you risk the chance of it not being checked until the next run. If you have made changes to your repository and the feedback in the static check file does not make sense, make sure you look at the time and day when it was run last, to see if your updates were actually taken into account. -->
-
-## Projects (P)
-
-Described on the [Project page](../projects).
-
-
-### Assignment Portfolio
-
-The Assignment Portfolio consists of three parts:
-- Group Assignments (80%) and Programming Assignments (20%). Note that the BuddyChecks are also required and make up 10% of the Group Assignments (10% overall MUDE grade). The ultimate deadline to submit all of the components of the Assignment Portfolio is the last Friday of instruction for the quarter (week 8) at 12:30 (the end of the last Friday classroom session). Please note, however, that a consistent weekly schedule has been incorporated into the course activities, in particular: bi-weekly feedback on the Group Assignment reports and weekly grading of the Programming Assignments. In addition, failure to cooperate with your group members may result in the requirement that you submit the Group Assignments individually. Please see the relevant pages on this website for further details.
-
-
-
-
-
-
-
-## Assessment
+Programming Assignments will be checked for a passing grade periodically throughout each week; **additional information will be provided later in Q1.**
 
-Each project is assessed on four categories using a discrete set of numeric criteria (4) for each, described in the sections below, with the total grade computed as a weighted sum. Every project receives equal weight, except Project 1, which is not included in the grade. 
+## Peer Feedback with Buddycheck
 
-### Deadlines for Feedback
-
-Feedback will be provided during the week after each project submission, and will be based on the files you submit via your GitLab repository. 
-- The deadline for submission is always Friday, 12:30 during the second week (although you can edit your GitLab repository until 13:30 to take care of technical issues, for example, fixing a merge conflict or uploading a file). Edits after that time will not be used for grading (this will be applied strictly starting with Project 4; Project 3 is an exception).
-- Some groups may be asked to make some changes based on the static check, but you will be only allowed to fix the issues reported in the `static_check.md`.
-
-Regarding questions about when you are allowed to make changes to your files:
-- You are _always_ allowed to continue working on your files, and to ask teachers about the content (this is highly encouraged!).
-- You are _not allowed_ to make changes to the answers and technical content (theory and code) of your files after Friday at 12:30 during the second week.
-
-We will use a _static check_ to evaluate your work after each Friday session. This involves the teaching team making a clone of your repository and checking to see if you have met a few basic requirements. For example, did you use the right file name, and does your notebook run without error? These criteria will be specified for each assignment, and if you did not meet the criteria, you will get a report in a `static_check.md` file notifying you of any issues.
-
-> Students that are just joining the Q2 projects as part of the completion of a previous year of MUDE are strongly encouraged to work through programming assignments PA03 and PA04 which introduce tips on how we encourage groups collaborate using _GitLab_. 
-
-### Grading Categories
-
-* **Documentation:** Readable and well-structured presentation of your results.
-* **Application:** Project specifications have been met and demonstrated.
-* **Programming:** Ensure that the implementation adequately commented and clear.
-* **Interpretation:** Findings reported based on good evidence and sound reasoning with good eng/sci insight displayed.
-
-Additional details about each grading category will be specified in the project description, and will be cumulative throughout the semester (especially for programming and documentation). For example, ifc week 1 focuses on using markdown cells and week 2 focuses on well-formatted figures as part of Project 1, you will be expected to produce markdown cells and well-formatted formatted figures in addition to the items specified in Project 2 during weeks 3 and 4.
-
-
-
-### Grading Criteria: Individual Project Reports
-
-> Updated for Q2 (Q1 used equal weights for each category)
-
-| Category | No Submission | Insufficient | Sufficient | Very good | Default Weight |
-|:------------:|:---:|:---:|:---:|:---:|:---:|
-| Documentation  | 0 | 1 | 3 | 5 | **0.15** |
-| Application  | 0 | 1 | 3 | 5 | **0.15** |
-| Programming  | 0 | 1 | 3 | 5 | **0.15** |
-| Interpretation  | 0 | 1 | 3 | 5 | **0.55** |
+*Buddycheck* is a learning tool designed to help peer evaluation amongst your group in a constructive and transparent way. A Buddycheck form must be submitted every week (you will recieve an announcement via Brightspace).
 
-This default assessment weight will be applied for each category, but this may vary based on the project. If different, actual weights will be specified in the project description.
+In addition to providing an opportunity for you to reflect on the performance of your group, and your role therein, the MUDE team will monitor the results and help guide those that may not be contributing in a productive and/or conscientious way. MUDE instructors may reach out to groups or individuals throughout the module, if necessary, and may alter the terms of Group Assignments for individuals. If after an initial warning, a second warning is issued, it may elicit in removal from the group, and the Assignment Portfolio for that quarter must be [completed individually](#as-an-individual-student).
 
-In general, we will expect you to submit a `Report.md` in markdown format. This file should be well-formatted with figures and text as necessary and any auxiliary files (like images) in a sub-directory. This document should summarize all findings in a clear and concise manner and will be the primary assessment piece. The `*.ipynb` will be checked to see how the findings have been determined. 
+The first BuddyCheck will be assigned in Week 1.1.
 
+**Additional information about BuddyCheck will be provided in Week 1.2.**
 
-### Grading Criteria: Project Portfolio
+## Group Assignments
 
-The Project Portfolio will be determined based on a 200 point scale, which consists of the following elements:
-- Projects: Generally speaking, 10 points per week; projects are graded for a max. of 140 points (Project 1 excluded).
-- Programming Assignments: 2.5 points each for a maximum of 35 points (PA01 and PA02 not graded). 
-- Buddycheck: 2 points each for a maximum of 12 points (Projects 1 and 2 not included).
-- Free points: 13
-- Total: 200 points
+The work you turn in with your group each Friday will be graded out of 10 points.
 
-Because the projects are graded with a coarse +/-2 point scale, and the objective is to give you quick feedback about your progress for the week, the project portfolio grades are allocated using a discrete scale, as illustrated in the following table: 
+There are a number of requirements that will be enforced for the **Group Assignment Reports**, which will be submitted as a combination of **Jupyter Notebooks**, **Python** and **Markdown** files. While providing the capability to present a wide variety of rich formatting, as well as facilitating computation, it is easy to produce documents that are simply un-readable --- these reporting requirements are designed to prevent that. Despite being part of your grade, these are generally good practices, and you will benefit by getting into the habit of applying these in your daily practice. 
 
-| Project Portfolio Grade | Points |
-| :---: | :---: |
-| <5.0 | <104 |
-| 5.0 | 104--123 |
-| 6.5 | 124--145 |
-| 7.5 | 146--161 |
-| 8.5 | 162--171 |
-| 9.0 | 172--181 |
-| 9.5 | 182--191 |
-| 10.0 | 192--200 |
+To help you get familiar with notebooks and how they can be used to write readable reports, we will slowly introduce concepts to you throughout the module. For example, the Group Assignments during Weeks 1.1 and 1.2 will give you a mostly-completed notebook to start with, whereas by the end of Q2 you may be creating notebooks and Markdown files from scratch.
 
-### Peer Feedback with Buddycheck
+**This section will be updated later in Q1, as the first two weeks are used to get you used to the Group Assignment format.**
 
-*Buddycheck* is a learning tool designed to help peer evaluation amongst your group in a constructive and transparent way. A Buddycheck form must be submitted every week (you will recieve an announcement via Brightspace).
+## Grading Criteria: Assignment Portfolio
 
-In addition to providing an opportunity for you to reflect on the performance of your group, and your role therein, the MUDE team will monitor the results and help guide those that may not be contributing in a productive and/or conscientious way. MUDE instructors may reach out to groups or individuals throughout the module, if necessary, and may alter the terms of projects for individuals. If after an initial warning, a second warning is issued, it may elicit in removal from the group, and the project portfolio for that quarter must be [completed individually](#as-an-individual-student).
+The Assignment Portfolio will be determined based on the total number of points earned on the following:
+- Group Assignments: 10 points each per week (maximum of 140 points)
+- Programming Assignments: 2.5 points (maximum of 35 points) 
+- Buddycheck: 2 points each (maximum of 28 points)
 
-## Documentation: Group Assignment Reports
+Note that all assignments during the first two weeks are ungraded, so points are calculated over 14 weeks (6 in Q1 and 8 in Q2), resulting in a maximum possible of 203 points.
 
-There are a number of requirements that will be enforced for the **Project Reports**, which will be submitted as a combination of **Jupyter Notebooks**, **Python** and **Markdown** files. While providing the capability to present a wide variety of rich formatting, as well as facilitating computation, it is easy to produce documents that are simply un-readable --- these reporting requirements are designed to prevent that. Despite being part of your project grade, these are generally good practices, and you will benefit by getting into the habit of applying these (and the [Golden Rules](../golden-rules)) in your daily practice. 
+Assignment Portfolio Grade is assigned until higherbracket reached; for example, 163 is a 7.0, 164 is a 7.5	
+        
+| points | % of max | Grade* |
+| :---: | :---: | :---: |
+| 203  |  100%   | 10.0 |
+| 200  |  99%	 | 9.5 |
+| 191  |  94%	 | 9.0 |
+| 182  |  90%	 | 8.5 |
+| 173  |  85%	 | 8.0 |
+| 164  |  81%	 | 7.5 |
+| 156  |  77%	 | 7.0 |
+| 149  |  73%	 | 6.5 |
+| 142  |  70%	 | 6.0 |
+| 125  |  62%	 | 5.5 |
+| 102  |  50%	 | 5.0 |
+| 81   |  40%	 | 4.0 |
+| 61   |  30%	 | 3.0 |
+| 41   |  20%	 | 2.0 |
+| 21   |  10%	 | 1.0 |
+| 1	   |  0%	 | 0.0 |
 
-To help you get familiar with notebooks and how they can be used to write readable reports, we will slowly introduce concepts to you throughout the module. For example, the project during weeks 1 and 2 will give you a mostly-completed notebook to start with, whereas by the end of Q2 you will be creating your own notebooks from scratch.
-
-We will go deeper into the expectations and requirements as the module progresses. 
+Note that active participation in the Programming Assignments and Buddy Checks along with an average score of 6 on the Group Assignments would provide just enough points to pass the Assignment Portfolio with a 6.0 (i.e., 30+28+84=142).
 
 ## Procedures and Conduct
 
 ### As a Group
 
 Option 1 (default---and strongly recommended!)
-* submit each project report as specified (generally each Friday at 12:30) and participate fairly with your group and you will receive timely feedback and keep up with the course contents
-
-Option 2: you don't submit a project (or are unable to do so for any valid reason)
-* notify instructors as soon as possible that you are not able to submit a project
+* submit each Group Assignment report as specified each Friday at 12:30 and participate fairly with your group and you will receive timely feedback and keep up with the course contents
 
-If you receive an insufficient score for a single project you are not allowed an opportunity to repair this, unless you also have an insufficient for the entire Q1 or Q2 project portfolio.
+Option 2: you don't submit a Group Assignment (or are unable to do so for any valid reason)
+* notify instructors as soon as possible that you are not able to submit a Group Assignment
 
-If you receive an insufficient (<5.8) for the Project Portfolio (both quarters combined), you must notify the instructors that you would like to do a resit prior to the first day of the 3rd quarter. A new assignment and timeline will be communicated to you shortly thereafter; this approach will result in maximum grade of 6.0 for the Project Portfolio.
+If you receive an insufficient score (<5.8) for a single Group Assignment you are not allowed an opportunity to repair this. If you receive an insufficient score (<5.8) for the entire Assignment Portfolio, you must notify the instructors that you would like to do a resit prior to the first day of the 3rd quarter. A new assignment and timeline will be communicated to you shortly thereafter; this approach will result in maximum grade of 6.0 for the Assignment Portfolio.
 
 ### As an Individual Student
 
-Students that have been removed from their group for any reason will complete the project portfolio for that quarter individually. This can be done in either quarter, with a maximum grade of 6.0. Completing the project portfolio in one quarter does not preclude participating in a group and receiving the group grade for the other quarter. The assignment scope and timeline will be communicated to you on a case-by-case basis.
-
-### Students from Previous Years
-
-You may find it useful to specifically review *Programming assignments PA03 and PA04* that concern the usage of Git into the projects and effective collaboration. If you did not follow the Git tutorial last year, you may find this a little confusing to navigate, so it may be worthwhile reviewing these and mentioning this to your project team.   
+Students that have been removed from their group for any reason will complete the Assignment Portfolio for that quarter individually. This can be done in either quarter, with a maximum grade of 6.0. Completing the Assignment Portfolio in one quarter does not preclude participating in a group and receiving the group grade for the other quarter. The assignment scope and timeline will be communicated to you on a case-by-case basis.
\ No newline at end of file