refactoring to version 1.7