Some adjustments
Some adjustments