Updated to latest wraparound implementation.