Refactored delayed change again