added state and menu