Wrap better