Old risk function made more sense