commit refactoring in progress