change in menu implementation ( optimized)