diff --git a/Classes/PhDThesisPSnPDF.cls b/Classes/PhDThesisPSnPDF.cls
index e6e474f..6e78433 100644
--- a/Classes/PhDThesisPSnPDF.cls
+++ b/Classes/PhDThesisPSnPDF.cls
@@ -99,28 +99,12 @@ footnotes.}
 % Page Size
 \newcommand\CUED@papersize{a4paper} % Set Default as a4paper
 
-\DeclareOption{a4paper}{
-  \renewcommand\CUED@papersize{a4paper}
-  % paperheight and paperwidth are set only for DVIPS (version 5.96 or below)
-  % to maintain backward compatability
-  \setlength{\paperheight}{297mm}
-  \setlength{\paperwidth} {210mm}
-}
-\DeclareOption{a5paper}{
-  \renewcommand\CUED@papersize{a5paper}
-  % paperheight and paperwidth are set only for DVIPS (version 5.96 or below)
-  % to maintain backward compatability
-  \setlength{\paperheight}{210mm}
-  \setlength{\paperwidth} {148mm}
-}
+\DeclareOption{a4paper}{\renewcommand\CUED@papersize{a4paper}}
+\DeclareOption{a5paper}{\renewcommand\CUED@papersize{a5paper}}
 \DeclareOption{letterpaper}{
   \ClassWarning{PhDThesisPSnPDF}{The Cambridge University Engineering Deparment
 PhD thesis guidelines recommend using A4 or A5paper}
   \renewcommand\CUED@papersize{letterpaper}
-  % paperheight and paperwidth are set only for DVIPS (version 5.96 or below)
-  % to maintain backward compatability
-  \setlength{\paperheight}{11in}
-  \setlength{\paperwidth} {8.5in}
 }
 
 \PassOptionsToClass{\CUED@papersize}{book}%
@@ -163,7 +147,7 @@ supported!}
 %* ***************************** Print / Online ********************************
 % Defines a print / online version to define page-layout and hyperrefering 
 \ifsetDVI
-\special{papersize=\paperwidth,\paperheight}
+%\special{papersize=\paperwidth,\paperheight}
 \RequirePackage[dvips]{hyperref}
 \else
 \RequirePackage[unicode]{hyperref}
@@ -190,7 +174,7 @@ supported!}
         \setMarginfalse
     \else
         % Odd and Even side Margin for binding and set viewmode for PDF
-	\RequirePackage[hmarginratio=1:1,vmarginratio=1:1,scale=0.75,bindingoffset=5mm]{geometry}
+	\RequirePackage[\CUED@papersize,hmarginratio=1:1,vmarginratio=1:1,scale=0.75,bindingoffset=5mm]{geometry}
 	\setMargintrue
     \fi
 
@@ -222,7 +206,7 @@ supported!}
         \setMarginfalse
     \else
 	% No Margin staggering on Odd and Even side 
-	\RequirePackage[hmarginratio=1:1,vmarginratio=1:1,scale=0.75]{geometry} 
+	\RequirePackage[\CUED@papersize,hmarginratio=1:1,vmarginratio=1:1,scale=0.75]{geometry} 
         \setMargintrue
     \fi
 
diff --git a/thesis.dvi b/thesis.dvi
index 7c5c9ea..a71193a 100644
Binary files a/thesis.dvi and b/thesis.dvi differ
diff --git a/thesis.pdf b/thesis.pdf
index fb0a357..72e8924 100644
Binary files a/thesis.pdf and b/thesis.pdf differ
diff --git a/thesis.ps b/thesis.ps
index ba0126b..580c864 100644
--- a/thesis.ps
+++ b/thesis.ps
@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0
 %%Creator: dvips(k) 5.993 Copyright 2013 Radical Eye Software
 %%Title: thesis.dvi
-%%CreationDate: Sun Dec  8 17:55:36 2013
+%%CreationDate: Sun Dec  8 18:37:41 2013
 %%Pages: 39
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 596 842
@@ -13,7 +13,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -z -o thesis.ps.temp thesis.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2013.12.08:1755
+%DVIPSSource:  TeX output 2013.12.08:1837
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S