Switched to Mag Calc Type #2