Revised to use Shock for Calc server