Chris refactoring