Added octave switching