^^ Right ... I believe those are the classes across the board now. Our local classes have been changed to those this year as well.
And yup, those R-comps who definitely put you in a higher class. I didn't know that the CAI changed your class though ... I thought the CAI was still okay in the ST class.