Changed to prefer manual folds