[REFACTORING #15 step 1,2,3]