changed end_time to end_date in template