Adapting new menus, reorganized class