most recent changes, diff for octave-integration