Change 3P3Z usage to 2P2Z, with buiuld switch to revert