Add ability to disable wrap (for speed)