simplifying deploy process and lessening inlining
Merge branch 'develop'