Handled refactoring of pretime window