diff --git a/Calendar/E-Paper.py b/Calendar/E-Paper.py
index f7881bb..09f72fc 100644
--- a/Calendar/E-Paper.py
+++ b/Calendar/E-Paper.py
@@ -429,18 +429,18 @@ def main():
                 if len(cal) is 5:
                     del upcoming[6:]
                     for dates in range(len(upcoming)):
-                        readable_date = datetime.strptime(upcoming[dates]['date'], '%Y %m %d').strftime('%-d %b')
+                        readable_date = upcoming[dates].begin.format('D MMM')
                         write_text(70, 25, readable_date, date_positions['d'+str(dates+1)])
                     for events in range(len(upcoming)):
-                        write_text(314, 25, (upcoming[events]['event']), event_positions['e'+str(events+1)], alignment = 'left')
+                        write_text(314, 25, upcoming[events].name, event_positions['e'+str(events+1)], alignment = 'left')
 
                 if len(cal) is 6:
                     del upcoming[4:]
                     for dates in range(len(upcoming)):
-                        readable_date = datetime.strptime(upcoming[dates]['date'], '%Y %m %d').strftime('%-d %b')
+                        readable_date = upcoming[dates].begin.format('D MMM')
                         write_text(70, 25, readable_date, date_positions['d'+str(dates+3)])
                     for events in range(len(upcoming)):
-                        write_text(314, 25, (upcoming[events]['event']), event_positions['e'+str(events+3)], alignment = 'left')
+                        write_text(314, 25, upcoming[events].name, event_positions['e'+str(events+3)], alignment = 'left')
 
 
             """