Track time changes better