improved calc (grades with cp and without mark)