refactoring step 4 [build working]