further plan updates
Merge branch 'staging'