more mode switching work, no real changes