some changes after Ircam Forum workshop