new updates and fixed start/end time
Committed the latest codes