Additional changes made