Kevin's changes to production

Recommend merging