Integrate Laurent's changes