refactor + playoffs