Improved folding.