Senior panel refactoring