Switched in the improved totalCMC function

Fixes #5