Grade update and insert Optimized