add current state of refactoring