refactored menu 2