refactoring in 1, started 2