small refactoring
added wrapper