2017 Changes to Code