Reworked wrapping.