changed to accomodate times past 23:59:00