More Fixes in Helper
Merge branch 'master' of https://github.com/mjs0031/Third_Project