need to update for time values