Some adjustements have been maked