few modifications - Adrien