Modifications for easier cross-validation.