refactoring 1.4