proper mode switching, stripped out all of the old r-series stuff