Removed the need for any end of day-ness