Included some changes for the new "initial" warp produced by ANTS.