Laurent's changes