Current sample logic now adds collapsibles.