Getting the D16 ZC Ready for the Swap