UNTESTED: Added Mr. Rehberg's shifter code