update helper functions
updates for CMS approval
Merge branch 'testchanges'
remove redundant file
extend eta range