a bit better wrapping