diff --git a/token-validator/grades.go b/token-validator/grades.go
index 8d9bf4a..4ed7c70 100644
--- a/token-validator/grades.go
+++ b/token-validator/grades.go
@@ -30,24 +30,52 @@ func computeGrades(_ httprouter.Params, _ []byte) (interface{}, error) {
 					if st.Challenge >= 200 {
 						switch st.Challenge {
 						case 200:
-							res[std.Login]["TP3"] += 5
+							res[std.Login]["TP3"] += 3
 						case 201:
-							res[std.Login]["TP3"] += 5
-						case 202:
-							res[std.Login]["TP3"] += 6
+							res[std.Login]["TP3"] += 2
 						case 203:
-							res[std.Login]["TP3"] += 4
+							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:
+							res[std.Login]["TP3"] += 1
+						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 {
 						case 100:
-							res[std.Login]["TP2"] += 4
+							res[std.Login]["TP2"] += 2
 						case 101:
-							res[std.Login]["TP2"] += 6
+							res[std.Login]["TP2"] += 2
 						case 102:
-							res[std.Login]["TP2"] += 6
+							res[std.Login]["TP2"] += 2
 						case 103:
-							res[std.Login]["TP2"] += 4
+							res[std.Login]["TP2"] += 3
+						case 104:
+							res[std.Login]["TP2"] += 1
+						case 105:
+							res[std.Login]["TP2"] += 1
+						case 106:
+							res[std.Login]["TP2"] += 3
+						case 107:
+							res[std.Login]["TP2"] += 3
+						case 108:
+							res[std.Login]["TP2"] += 2
+						case 109:
+							res[std.Login]["TP2"] += 2
 						}
 					} else {
 						switch st.Challenge {