okay, this works
Refactored
Refactored
refactoring
refactoring