refactoring #1 places