refactored
refactored this too
refactored eveything using Values