Shifted around the time logic in prep for autoupdating time
Recommit to correct merge issues