refactor redefinition of time