Improved wrapping