Refactored in UpdateScheduler
Merged