Additional Changes to Code