improve folding