Another major change to calcs

Introduced bug #22