More changes and additions