End of the first round of refactoring, with the timing window