Merging with modifications from Edouard