diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/StorageBasedMerchant.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/StorageBasedMerchant.java
index a18b04dfe..06d78ba79 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/StorageBasedMerchant.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/StorageBasedMerchant.java
@@ -21,8 +21,10 @@ public class StorageBasedMerchant implements Merchant {
     private static final int MIN_SELL_PRICE = 2;
     private static final int MIN_BUY_PRICE = 1;
 
-    private static final int DOUBLE_AFTER_DAYS = 60;
-    private static final double PRICE_SHIFT_AFTER_TRANSACTION = 1.05;
+    private static final int DOUBLE_AFTER_DAYS_NO_STOCK = 7;
+    private static final int HALVE_AFTER_DAYS_IN_STOCK = 60;
+
+    private static final double PRICE_SHIFT_AFTER_TRANSACTION = 1.1;
 
     private LotroCardBlueprintLibrary _library;
     private MerchantDAO _merchantDao;
@@ -113,9 +115,9 @@ public class StorageBasedMerchant implements Merchant {
         }
 
         if (stock > 0)
-            return basePrice / (1+ Math.pow(daysSinceLastTransaction/DOUBLE_AFTER_DAYS, 1.5));
+            return basePrice / (1+ Math.pow(daysSinceLastTransaction/HALVE_AFTER_DAYS_IN_STOCK, 1.5));
         else
-            return basePrice * (1+ Math.pow(daysSinceLastTransaction/DOUBLE_AFTER_DAYS, 1.5));
+            return basePrice * (1+ Math.pow(daysSinceLastTransaction/DOUBLE_AFTER_DAYS_NO_STOCK, 1.5));
 
     }
 
@@ -136,4 +138,3 @@ public class StorageBasedMerchant implements Merchant {
         throw new RuntimeException("Unknown rarity for priced card: " + cardRarity);
     }
 }
-;
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/merchant/StorageBasedMerchantTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/merchant/StorageBasedMerchantTest.java
index 7062ecc57..6886a0ede 100644
--- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/merchant/StorageBasedMerchantTest.java
+++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/merchant/StorageBasedMerchantTest.java
@@ -46,7 +46,7 @@ public class StorageBasedMerchantTest {
     public void cardPriceLowersAfterMerchantBuys() {
         _merchant.cardBought("1_1", new Date(0), 700);
         int cardInitialPrice = _merchant.getCardSellPrice("1_1", new Date(0));
-        assertEqualsMoreOrLess((int) (1000 / 1.05f), cardInitialPrice);
+        assertEqualsMoreOrLess((int) (1000 / 1.1f), cardInitialPrice);
     }
 
     @Test
@@ -57,7 +57,7 @@ public class StorageBasedMerchantTest {
 
         _merchant.cardSold("1_1", new Date(0), 1000);
         int cardInitialPrice = _merchant.getCardSellPrice("1_1", new Date(0));
-        assertEqualsMoreOrLess((int) (1000*1.05f), cardInitialPrice);
+        assertEqualsMoreOrLess((int) (1000*1.1f), cardInitialPrice);
     }
 
     @Test
@@ -73,7 +73,7 @@ public class StorageBasedMerchantTest {
         assertTrue(initialPrice > _merchant.getCardBuyPrice("1_1", new Date(DAY)));
     }
 
-    // @Test
+    @Test
     public void plotPricesAfterTransactions() {
         Date setupDate = new Date(-1000 * 60 * 60 * 24 * 50L);
         Date firstTrans = new Date(0);
@@ -89,7 +89,7 @@ public class StorageBasedMerchantTest {
 
         System.out.println("-2,1000,700,1000,700");
         for (long time = 0; time < hour * 24 * 35L; time += hour * 2) {
-            System.out.println(time / hour + "," + merchant.getCardSellPrice("1_1", new Date(time)) + "," + merchant.getCardBuyPrice("1_1", new Date(time))
+            System.out.println((time / hour /24f) + "," + merchant.getCardSellPrice("1_1", new Date(time)) + "," + merchant.getCardBuyPrice("1_1", new Date(time))
                     + "," + merchant.getCardSellPrice("1_2", new Date(time)) + "," + merchant.getCardBuyPrice("1_2", new Date(time)));
         }
     }
@@ -106,7 +106,7 @@ public class StorageBasedMerchantTest {
         long hour = 1000 * 60 * 60;
 
         for (long time = 0; time < hour * 24 * 35L; time += hour * 2)
-            System.out.println(time / hour + "," + merchant.getCardSellPrice("1_1", new Date(time)) + "," + merchant.getCardBuyPrice("1_1", new Date(time)));
+            System.out.println((time / hour /24f) + "," + merchant.getCardSellPrice("1_1", new Date(time)) + "," + merchant.getCardBuyPrice("1_1", new Date(time)));
     }
 
     private void assertEqualsMoreOrLess(int expected, int given) {