Removed hard coded start and end times