master: updating to include folds