Changes to handle current week time table