modif after meeting on Ocean
need to put think back to previous change for Fliis and Guilh works