C16 – SpearMC Upgrade or Re-implement