diff --git a/Calendar/calibration.py b/Calendar/calibration.py
index adc428d..98b062a 100644
--- a/Calendar/calibration.py
+++ b/Calendar/calibration.py
@@ -1,40 +1,45 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
+"""
+Calibration module for the Black-White and Black-White-Red E-Paper display
+Calibration refers to flushing all pixels in a single colour to prevent
+ghosting.
+"""
+
+from __future__ import print_function
+import time
 from settings import display_colours
-from PIL import Image, ImageDraw
-
-
-EPD_WIDTH = 640
-EPD_HEIGHT = 384
+from icon_positions_locations import black, white, red
 
 def calibration():
+    """Function for Calibration"""
     if display_colours == "bwr":
         import epd7in5b
         epd = epd7in5b.EPD()
+        print('_________Calibration for 3-Colour E-Paper started_________'+'\n')
     if display_colours == "bw":
         import epd7in5
         epd = epd7in5.EPD()
+        print('_________Calibration for 2-Colour E-Paper started_________'+'\n')
     for i in range(2):
         epd.init()
-        black = Image.new('1', (EPD_WIDTH, EPD_HEIGHT), 'black')
-        print('calibrating black...')
-        ImageDraw.Draw(black)
+        print('Calibrating black...')
         epd.display_frame(epd.get_frame_buffer(black))
         if display_colours == "bwr":
-            red = Image.new('L', (EPD_WIDTH, EPD_HEIGHT), 'red')
-            ImageDraw.Draw(red)
             print('calibrating red...')
             epd.display_frame(epd.get_frame_buffer(red))
-        white = Image.new('1', (EPD_WIDTH, EPD_HEIGHT), 'white')
-        ImageDraw.Draw(white)
-        print('calibrating white...')
+        print('Calibrating white...')
         epd.display_frame(epd.get_frame_buffer(white))
         epd.sleep()
-    print('Calibration complete')
+        print('Cycle', str(i+1)+'/2', 'complete'+'\n')
+        print('Calibration complete')
 
 def main():
-    for i in range(1):
-        calibration()
+    """Added timer"""
+    start = time.time()
+    calibration()
+    end = time.time()
+    print('Calibration complete in', int(end - start), 'seconds')
 
 if __name__ == '__main__':
     main()