2015 upgrade

Upgrade content to match 2015 requirements