updated to new menu handling