Senior Panel refactor