Adjust calcs to correctly match original wc columns