[REFACTORING #15:2]