added grades limit management