updated for state menu