Yet more changes. New fold method gives more training possibilities