Update to calc-space mixing, uncommenting return for rem