Some more changes 3

More changes