[Slide] - Updated wrapping logic