Liviu modif for Thierry repo