improved wrappers