Updated grades for GA.
Updated grades for CN.
Fixes for GA