[REFACTORING #15:3]