refactoring to Henko