More changes to the code