use new wrapping convention