Colin refactoring
Colin refactoring