merge Pierre's work #1