Additional changes to the code.