Reverted to previous warp pointer structures