more work on the wrappers and unwrappers