Lots of changes that make comp scores more logical.