Fixed the merge between Yannis and I

Things are doing things