Use the new MenuState