updates to deal with times in dates