Replaced OnExecute() with OnEnter()