p 121 in the middle of refactoring