Merged original with Francois file