Pierre's changes...