updated panel
merged changes