Before refactoring using orion