Party refactor