make wrapping better