More changes in code