Make changes based on Auk's comments
t pushMerge branch 'develop'