ForgottenControl refactoring