diff --git a/Classes/PhDThesisPSnPDF.cls b/Classes/PhDThesisPSnPDF.cls
index c0374c0..375372a 100644
--- a/Classes/PhDThesisPSnPDF.cls
+++ b/Classes/PhDThesisPSnPDF.cls
@@ -28,7 +28,7 @@
 \newif\if@print\@printfalse
 \DeclareOption{print}{\@printtrue}
 
-\newif\ifPHD@draft\PHD@draftfalse
+\newif\ifsetDraft\setDraftfalse
 
 % ****************************** Define index **********************************
 \newif\ifPHD@index\PHD@indexfalse
@@ -213,7 +213,7 @@ footnotes.}
 \ClassWarning{PhDThesisPSnPDF}{Draft is ON. You can use `draftmode' instead,
   which adds watermark with timestamp and line numbering. Don't forget to turn 
   `draft' off for your final version.}}%
-\DeclareOption{draftmode}{\PassOptionsToClass{draft}{book}\PHD@drafttrue 
+\DeclareOption{draftmode}{\PassOptionsToClass{draft}{book}\setDrafttrue 
 \ClassWarning{PhDThesisPSnPDF}{Draft Mode is ON.
   Don't forget to turn it off for your final version.}}% 
 
@@ -326,7 +326,7 @@ supported!}
 
 
 % If Draft Mode is active
-\ifPHD@draft
+\ifsetDraft
 
 % Line numbering (can be switched off)
 \ifPHD@lineno
diff --git a/Preamble/preamble.tex b/Preamble/preamble.tex
index ddf0f32..ed64e9c 100644
--- a/Preamble/preamble.tex
+++ b/Preamble/preamble.tex
@@ -182,8 +182,8 @@
 %% Todo notes functionality
 %% Uncomment the following lines to have todonotes.
 
-\usepackage[colorinlistoftodos]{todonotes}
-\newcommand{\mynote}[1]{\todo[author=kks32,size=\small,inline,color=green!40]{#1}}
+%\usepackage[colorinlistoftodos]{todonotes}
+%\newcommand{\mynote}[1]{\todo[author=kks32,size=\small,inline,color=green!40]{#1}}
 
 
 % Example todo: \mynote{Hey! I have a note}
diff --git a/thesis.pdf b/thesis.pdf
index cf3154c..6b0dd93 100644
Binary files a/thesis.pdf and b/thesis.pdf differ