Adding Octave mode