Additional menu

improve overall performance