resumed vector wrapping and improved wrapper