tweaks and collapsing