More changes and updates