[REFACTORING #15.1]