Added folding.  Can now better use either.