Chris refactor