Revert to old code
Revert "Revert to old code"

This reverts commit 64710d1707ae2a01b4dc9e624f8aeffe09eca75d.
Merge branch 'master' of https://github.com/acgh213/CALCOINS