Added some constraints to benchmark_grade