Added menu_select branch and logic