More changes to code