Upgrade plan changes from 8/9 meeting