Yes, however, I see no way to refactor the new_cov weighting (without ending up with huge arrays).