Some adjustements
Some adjustements