refactoring + playoffs