refactoring wrappers