Added cross-validation into the mix