Added two states (menu and play), doesnt affect current setup