both... def panel refactor