updates to panel
Merge