Improved collapsing