Redone panel_contains