Added the rest of the Mode Switch