Updating with changes from Francois