Adapted according to Thierry proposition