Smoother wraparound