refactoring with regard to old API ;)