diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index afba6363..fdf35eb1 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -83,10 +83,8 @@ Value Eval::evaluate(const Eval::NNUE::Networks&    networks,
     optimism += optimism * nnueComplexity / 470;
     nnue -= nnue * nnueComplexity / 20000;
 
-    int material = 300 * pos.count<PAWN>() + 350 * pos.count<KNIGHT>() + 400 * pos.count<BISHOP>()
-                 + 640 * pos.count<ROOK>() + 1200 * pos.count<QUEEN>();
-
-    v = (nnue * (34300 + material) + optimism * (4400 + material)) / 36672;
+    int material = 600 * pos.count<PAWN>() + pos.non_pawn_material();
+    v            = (nnue * (68600 + material) + optimism * (8800 + material)) / 73344;
 
     // Damp down the evaluation linearly when shuffling
     v -= v * pos.rule50_count() / 212;