Incorporate Pierre's changes