More changes made