Some adjustments
More changes