AdeelK93 Added conditional collapsing