Merging Declan and Fabien + update config files