Refactored w/ John