Update for zrpn split.