Updated RemoteControlWithUndo