refactored
refactored 2