Tim's edits on Performance Budget
Merge branch 'develop'