simplified the helpers loading mechanism
removed some redundant code
Merge branch 'exp'