crypto helper should be intialized correctly
Merge with Kevin's