Added non-parent folding