passed, not yet refactored. Might not need to.
refactored using a block