Made octave order and note order changes work