update 2.18 for additional grades