own collapsible & fixes