diff --git a/src/engine/net/client/handlers/MerchantMsgHandler.java b/src/engine/net/client/handlers/MerchantMsgHandler.java
index 0adbace4..0df4fd97 100644
--- a/src/engine/net/client/handlers/MerchantMsgHandler.java
+++ b/src/engine/net/client/handlers/MerchantMsgHandler.java
@@ -191,12 +191,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             return;
         }
 
-        int rank = shrine.getRank();
-        //R8 trees always get atleast rank 2 boons. rank uses index, where 0 is first place, 1 is second, etc...
-        if (shrineBuilding.getCity() != null && shrineBuilding.getCity().getTOL() != null && shrineBuilding.getCity().getTOL().getRank() == 8)
-            if (rank != 0)
-                rank = 1;
-        int trains = 40 - (rank * 10);
+        int trains =  5 * npc.getRank() + 5;//40 - (rank * 10);
         if (trains < 0)
             trains = 0;