diff --git a/token-validator/grades.go b/token-validator/grades.go
index 4ed7c70..7aaecf4 100644
--- a/token-validator/grades.go
+++ b/token-validator/grades.go
@@ -36,23 +36,19 @@ func computeGrades(_ httprouter.Params, _ []byte) (interface{}, error) {
 						case 203:
 							res[std.Login]["TP3"] += 2
 						case 204:
-							res[std.Login]["TP3"] += 1
-						case 205:
-							res[std.Login]["TP3"] += 1
-						case 206:
 							res[std.Login]["TP3"] += 2
-						case 207:
+						case 205:
+							res[std.Login]["TP3"] += 2
+						case 206:
 							res[std.Login]["TP3"] += 1
+						case 207:
+							res[std.Login]["TP3"] += 2
 						case 208:
 							res[std.Login]["TP3"] += 2
 						case 209:
 							res[std.Login]["TP3"] += 2
 						case 210:
 							res[std.Login]["TP3"] += 2
-						case 211:
-							res[std.Login]["TP3"] += 1
-						case 212:
-							res[std.Login]["TP3"] += 1
 						}
 					} else if st.Challenge >= 100 {
 						switch st.Challenge {
@@ -84,7 +80,7 @@ func computeGrades(_ httprouter.Params, _ []byte) (interface{}, error) {
 						case 2:
 							res[std.Login]["TP1"] += 3
 						case 3:
-							res[std.Login]["TP1"] += 4
+							res[std.Login]["TP1"] += 3
 						case 4:
 							res[std.Login]["TP1"] += 2
 						case 5:
@@ -92,12 +88,14 @@ func computeGrades(_ httprouter.Params, _ []byte) (interface{}, error) {
 						case 6:
 							res[std.Login]["TP1"] += 1
 						case 7:
-							res[std.Login]["TP1"] += 2
+							res[std.Login]["TP1"] += 1
 						case 8:
 							res[std.Login]["TP1"] += 1
 						case 9:
 							res[std.Login]["TP1"] += 1
 						case 10:
+							res[std.Login]["TP1"] += 2
+						case 11:
 							res[std.Login]["TP1"] += 1
 						}
 					}