diff --git a/kalibrierschein/kalibrierschein.cls b/kalibrierschein/kalibrierschein.cls
index 276917e677c1208afe31713aeffca39ffdd8279e..071aef91a1d5458d43175badf9cc727c32b15478 100644
--- a/kalibrierschein/kalibrierschein.cls
+++ b/kalibrierschein/kalibrierschein.cls
@@ -1,12 +1,13 @@
 
 \setcounter{errorcontextlines}{100}
+\RequirePackage{ifdraft}
 \newcommand*\ks@location{Berlin}
 \newcommand*\ks@kalType{KK}
 \newcommand*\ks@layout{-0000}
 \newcommand*\ks@langs{ngerman,main=english}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{kalibrierschein}
-  [2017/12/01 v0.2c Dokumentenklasse (RN/PTB)]
+  [2018/03/20 v0.3a Dokumentenklasse (RN/PTB)]
 \DeclareOption{BS}{\def\ks@location{Braunschweig}}
 \DeclareOption{BLN}{\def\ks@location{Berlin}}
 \DeclareOption{KK}{\edef\ks@kalType{\CurrentOption}}
@@ -37,10 +38,12 @@
 \RequirePackage[autostyle=true,german=guillemets,maxlevel=3]{csquotes}%
 \RequirePackage{iflang}
 \IfLanguageName{ngerman}{%
+  \newcommand*\ks@draftName{Entwurf}%
   \AtEndOfClass{\shorthandon{"}}
   \defineshorthand{"`}{\openautoquote}
   \defineshorthand{"'}{\closeautoquote}
 }{%
+  \newcommand*\ks@draftName{Draft}%
 }
 \MakeAutoQuote{»}{«}
 \AtEndOfClass{%
@@ -83,6 +86,7 @@
 \RequirePackage{ltablex}\keepXColumns{}
 \setcounter{LTchunksize}{100}
 
+\PassOptionsToPackage{final}{graphicx}
 \RequirePackage{eso-pic,graphicx,booktabs}
 \RequirePackage{zref-totpages}
 
@@ -376,17 +380,28 @@
   \endgroup
 }
 
-\AtBeginDocument{%
-  \ifnum\number\ks@missingEntries>0 %
+\AtBeginDocument{
+  \ifdraft{
     \AddToShipoutPictureBG{%
       \AtTextCenter{%
         \makebox(0,0)[c]{\resizebox{\textwidth}{!}{%
           \rotatebox{54.7}{%
             \textnormal{\textsf{\textbf{%
-              \color{lightgray}Fehler:~\ks@missingEntries}}}}}}%
+              \color{lightgray}\ks@draftName}}}}}}%
       }%
     }%
-  \fi
+  }{%
+    \ifnum\number\ks@missingEntries>0 %
+      \AddToShipoutPictureBG{%
+        \AtTextCenter{%
+          \makebox(0,0)[c]{\resizebox{\textwidth}{!}{%
+            \rotatebox{54.7}{%
+              \textnormal{\textsf{\textbf{%
+                \color{lightgray}Fehler:~\ks@missingEntries}}}}}}%
+        }%
+      }%
+    \fi  
+  }
 }
 
 \RequirePackage[