diff --git a/Lectures/L18_MISContinued/MISContinued.pdf b/Lectures/L16_MISContinued/MISContinued.pdf
similarity index 71%
rename from Lectures/L18_MISContinued/MISContinued.pdf
rename to Lectures/L16_MISContinued/MISContinued.pdf
index b27b60c4147f419d67ccb1d496fe8a2cc16a73b6..cb1308887bd152ce06560378151a28aca99e87f7 100644
Binary files a/Lectures/L18_MISContinued/MISContinued.pdf and b/Lectures/L16_MISContinued/MISContinued.pdf differ
diff --git a/Lectures/L18_MISContinued/MISContinued.tex b/Lectures/L16_MISContinued/MISContinued.tex
similarity index 86%
rename from Lectures/L18_MISContinued/MISContinued.tex
rename to Lectures/L16_MISContinued/MISContinued.tex
index fcf64ae2c65fe2222013d3def3bd9a44462353d9..9d9737b4ad1471f532f15a9475cef6288d962049 100755
--- a/Lectures/L18_MISContinued/MISContinued.tex
+++ b/Lectures/L16_MISContinued/MISContinued.tex
@@ -31,7 +31,7 @@
 
 \input{../def-beamer}
 
-\newcommand{\topic}{18 MIS Continued}
+\newcommand{\topic}{MIS Continued}
 
 \input{../titlepage}
 
@@ -49,7 +49,8 @@
 \item Administrative details
 %\item Feedback on System VnV Plan
 \item Questions?
-\item Take up Homework
+%\item Take up Homework
+\item Nonfunctional requirements
 \item Review: Records, Libraries, ADTs, Abstract Objects, Generic ADTs
 \item Example - Student data
 \item Exceptions
@@ -65,37 +66,47 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% \begin{frame}
-% \frametitle{Administrative Details}
-
-% \bi
-% \item GitHub issues for colleagues
-% \bi
-% \item Assigned 1 colleague (see \texttt{Repos.xlsx} in repo)
-% \item Provide at least 2 issues on their MG
-% \item Grading as before
-% \item Due by yesterday (Thursday), Nov 8 at 11:59 pm
-% \ei
-% \item MIS template in CAS 741 repo
-% \ei
+\begin{frame}
+\frametitle{Administrative Details}
 
-% \end{frame}
+\bi
+\item When developing your code, remember that your goal is for someone else to
+  be able to compile and run it
+\item Upcoming classes
+\bi
+\item L16 - MIS Continued
+\item L17 - POC + MG Presentations
+\item L18 - MIS Presentations
+\ei
+\item Mathematical review (\cite{HoffmanAndStrooper1995} and separate slides)
+\item Potential software for drawing figures
+\bi
+\item \href{https://app.diagrams.net/} {draw.io}
+\item \href{https://www.bu.edu/math/files/2013/08/tikzpgfmanual.pdf} {Tkiz} 
+\ei
+\ei
+
+\end{frame}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{frame}
 \frametitle{Administrative Details: Report Deadlines}
 ~\newline
-\begin{tabular}{l l l}
-MG + MIS & Week 10 & Nov 25\\
-Final Documentation & Week 14 & Dec 9\\
+\begin{tabular}{l l}
+%\textbf{SRS} & Oct 8\\
+\textbf{MG + MIS (Traditional)} & Nov 19\\
+\textbf{Drasil Code and Report (Drasil)} & Nov 19\\
+Final Documentation & Dec 9\\
 \end {tabular}
 
 \bi
 \item The written deliverables will be graded based on the repo contents as of
 11:59 pm of the due date
-\item If you need an extension, please ask
+\item If you need an extension for a written deliverable, please ask
+\item You should inform your primary and secondary reviewers of the extension
 \item Two days after each major deliverable, your GitHub issues will be due
-\item Domain expert code due 1 week after MIS deadline
+%\item Domain expert code due 1 week after MIS deadline
 \ei
 
 \end{frame}
@@ -103,19 +114,25 @@ Final Documentation & Week 14 & Dec 9\\
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{frame}
-\frametitle{Administrative Details: Presentations}
-
-~\newline
-\begin{tabular}{l l l}
-\textbf{MIS Semantics Present} & Week 11 & Week of Nov 18\\
-Unit VnV or Impl.\ Present & Week 12/13 & Week of Nov 28\\
-\end {tabular}
+\frametitle{Admin Details: Presentation Schedule}
 
 \bi
-\item Informal presentations with the goal of improving everyone's written
-  deliverables
-\item Domain experts and secondary reviewers (and others) will ask questions
-  (listed in Repos.xlsx file)
+\item Proof of Concept Demonstrations (15 min)
+\bi
+\item \textbf{Thurs, Nov 12: Salah, John}
+\ei
+\item MG Present (10 minutes)
+\bi
+\item \textbf{Thurs, Nov 12: John, Tiago, Leila, Xuanming, Andrea}
+\ei
+\item MIS Present
+\bi
+\item Mon, Nov 16: Shayan, Parsa, Gaby, Sid, Xingzhi
+\ei
+\item Drasil Project Present (20 min each)
+\bi
+\item Thurs, Nov 26: Andrea, Naveen, Ting-Yu
+\ei
 \ei
 
 \end{frame}
@@ -123,39 +140,48 @@ Unit VnV or Impl.\ Present & Week 12/13 & Week of Nov 28\\
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{frame}
-\frametitle{Administrative Details: Presentation Schedule}
+\frametitle{Presentation Schedule Continued}
 
 \bi
-\item \textbf{MIS Syntax + Semantics Present}
-\bi
-\item Monday: Zhi, Peter, \emph{Sasha}
-\item Thursday:  Sharon, Ao, ?
-\ei
-\item Unit VnV Plan or Impl.\ Present
+\item Test or Impl.\ Present (15 min each)
 \bi
-\item Monday: Bo, Sasha, ?
-\item Thursday: Zhi, Peter, Ao, ?
+\item Mon, Nov 30: John, Salah, Liz, Xingzhi, Leila
+\item Thurs, Dec 3: Shayan, Naveen, Sid, Gaby, Seyed
+\item Mon, Dec 7: Ting-Yu, Xuanming, Mohamed, Andrea, Tiago
 \ei
+\item 4 presentations each
+\item If you will miss a presentation, please trade with someone else
 \ei
 
-Optional presentation in italics.\\
-Room for more volunteers.  :-)
-
 \end{frame}
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{frame}
 \frametitle{Questions?}
 \begin{itemize}
-\item Questions about MIS presentations?
-\item Questions about MIS documentation?
+\item Questions on administrative details?
+\item Questions about Module Guide?
+\item Questions about upcoming presentation?
+\item Questions about MIS?
 \item Other questions?
 \end{itemize}
 \end{frame}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\begin{frame}
+\frametitle{Nonfunctional Requirements}
+\begin{itemize}
+\item Aim to be unambiguous
+\item Say the quality you want to achieve, not how you are going to achieve it
+\item Point to the Verification and Validation plan
+\item Added to the blank SRS template
+\end{itemize}
+\end{frame}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 % \begin{frame}
 
 % \frametitle{Feedback on System VnV Plan}
@@ -182,34 +208,63 @@ Room for more volunteers.  :-)
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\begin{frame}
-\frametitle{Take up Homework}
-\end{frame}
+% \begin{frame}
+% \frametitle{Take up Homework}
+% \end{frame}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{frame}
-\frametitle{Examples of Modules \cite{GhezziEtAl2003}}
+\frametitle{Examples of Modules: Record \cite{GhezziEtAl2003}}
 
-\begin{itemize}
-
-\item \structure{Record}
 \begin{itemize}
 \item Consists of only data
 \item Has state but no behaviour
+\item Example
+\bi
+\item Specification Parameters Module in SWHS
+\ei
 \end{itemize}
-\item \structure{Collection of related procedures (library)}
+
+\end{frame}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{frame}
+\frametitle{Examples of Modules: Library \cite{GhezziEtAl2003}}
+
 \begin{itemize}
+\item \structure{Collection of related procedures (library)}
 \item Has behaviour but no state
 \item Procedural abstractions
 % like many routines in a scientific computing library
+\item Example
+\bi
+\item Library of trigonometric functions
+\item ODE Solver Module in SWHS
+\item
+  \href{https://gitlab.cas.mcmaster.ca/smiths/se2aa4_cs2me3/-/blob/master/Assignments/PreviousYears/2018/A2/A2.pdf}
+  {Sequence Services Module}
+\ei
 \end{itemize}
-\item \structure{Abstract object}
+
+\end{frame}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{frame}
+\frametitle{Examples of Modules: Abstract Object  \cite{GhezziEtAl2003}}
+
 \begin{itemize}
 \item Consists of data (\structure{fields}) and procedures (\structure{methods})
 \item Consists of a collection of \structure{constructors},
   \structure{selectors}, and \structure{mutators}
 \item Has state and behaviour
+\item There is only ONE
+\item Example
+\begin{itemize}
+\item Input Parameters Module for SWHS
+\item Logger
 \end{itemize}
 \end{itemize}
 
@@ -218,19 +273,32 @@ Room for more volunteers.  :-)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{frame}
-\frametitle{Examples of Modules Continued}
-
-\begin{itemize}
+\frametitle{Examples of Modules: Abstract Data Type \cite{GhezziEtAl2003}}
 
-\item \structure{Abstract data type (ADT)}
 \begin{itemize}
+\item What you are used to for OO programming
 \item Consists of a collection of abstract objects and a collection of
   procedures that can be applied to them
 \item Defines the set of possible values for the type and the associated
   procedures that manipulate instances of the type
 \item Encapsulates the details of the implementation of the type
+\item Multiple instances of the object
+\item Keyword \textbf{Template} in MIS
+\item Example
+\bi
+\item
+  \href{https://gitlab.cas.mcmaster.ca/smiths/se2aa4_cs2me3/-/blob/master/Assignments/PreviousYears/2018/A2/A2.pdf}
+  {Curve ADT Module}
+\ei
 \end{itemize}
-\item \structure{Generic Modules}
+
+\end{frame}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{frame}
+\frametitle{Examples of Modules: Generic \cite{GhezziEtAl2003}}
+
 \begin{itemize}
 \item A single abstract description for a family of abstract objects or ADTs
 \item Parameterized by type
@@ -238,8 +306,12 @@ Room for more volunteers.  :-)
   only differ in their type information
 \item A generic module facilitates specification of a stack of integers, stack
   of strings, stack of stacks etc.
-\end{itemize}
-
+\item Example
+\bi
+\item
+  \href{https://gitlab.cas.mcmaster.ca/smiths/se2aa4_cs2me3/-/blob/master/Assignments/PreviousYears/2019/A2/A2.pdf}
+  {Generic Sequence ADT Module}
+\ei
 \end{itemize}
 
 \end{frame}
@@ -247,7 +319,7 @@ Room for more volunteers.  :-)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \begin{frame}
-\frametitle{Example Student Data}
+\frametitle{Chemistry Example - Highlight Mathematics}
 \begin{itemize}
 \item
   \href{https://gitlab.cas.mcmaster.ca/smiths/se2aa4_cs2me3/blob/master/Assignments/A2/A2.pdf}
diff --git a/Lectures/L16_MathReviewPlusExample/MathReviewPlusExample.pdf b/Lectures/MathReviewPlusExample/MathReviewPlusExample.pdf
similarity index 100%
rename from Lectures/L16_MathReviewPlusExample/MathReviewPlusExample.pdf
rename to Lectures/MathReviewPlusExample/MathReviewPlusExample.pdf
diff --git a/Lectures/L16_MathReviewPlusExample/MathReviewPlusExample.tex b/Lectures/MathReviewPlusExample/MathReviewPlusExample.tex
similarity index 100%
rename from Lectures/L16_MathReviewPlusExample/MathReviewPlusExample.tex
rename to Lectures/MathReviewPlusExample/MathReviewPlusExample.tex
diff --git a/Lectures/L16_MathReviewPlusExample/StoichExamplePage1.pdf b/Lectures/MathReviewPlusExample/StoichExamplePage1.pdf
similarity index 100%
rename from Lectures/L16_MathReviewPlusExample/StoichExamplePage1.pdf
rename to Lectures/MathReviewPlusExample/StoichExamplePage1.pdf
diff --git a/Lectures/L16_MathReviewPlusExample/StoichExamplePage2.pdf b/Lectures/MathReviewPlusExample/StoichExamplePage2.pdf
similarity index 100%
rename from Lectures/L16_MathReviewPlusExample/StoichExamplePage2.pdf
rename to Lectures/MathReviewPlusExample/StoichExamplePage2.pdf