Refactored...much better.