Uniformisation package + prep work Antoine.