Improved wrapping.