update to work with menu handling