improved modus handling