last update before "glissando" branch