Recfactored w/new method - tests still pass