did some modifications, adding an interactive callendar