Pulling in the changes from Nicolas