better wrapping
ready for release