Updated to add end date/time