recently changed
before refactoring
after refactoring