Additional changes

More changes to the code.