Matt's refactor