diff --git a/AlethenaShares/contracts/AlethenaShares.sol b/AlethenaShares/contracts/AlethenaShares.sol
index e24881b0..4d5d1c4b 100644
--- a/AlethenaShares/contracts/AlethenaShares.sol
+++ b/AlethenaShares/contracts/AlethenaShares.sol
@@ -43,7 +43,7 @@ contract AlethenaShares is ERC20, Claimable {
 
     mapping(address => uint256) balances;
     uint256 totalSupply_;        // total number of tokenized shares, sum of all balances
-    uint256 totalShares_ = 1410000; // total number of outstanding shares, maybe not all tokenized
+    uint256 totalShares_ = 1397188; // total number of outstanding shares, maybe not all tokenized
 
     event Mint(address indexed shareholder, uint256 amount, string message);
     event Unmint(uint256 amount, string message);
diff --git a/AlethenaShares/contracts/Claimable.sol b/AlethenaShares/contracts/Claimable.sol
index 03abd80a..b47f3667 100644
--- a/AlethenaShares/contracts/Claimable.sol
+++ b/AlethenaShares/contracts/Claimable.sol
@@ -37,7 +37,7 @@ contract Claimable is ERC20Basic, Ownable {
     /** @param collateralRate Sets the collateral needed per share to file a claim */
     uint256 public collateralRate = 5*10**15 wei;
 
-    uint256 public claimPeriod = 60*60*24*30; // In seconds ;
+    uint256 public claimPeriod = 60*60*24*180; // In seconds ;
     uint256 public preClaimPeriod = 60*60*24; // In seconds ;
 
     mapping(address => Claim) public claims; // there can be at most one claim per address, here address is claimed address
diff --git a/AlethenaShares/contracts/Ownable.sol b/AlethenaShares/contracts/Ownable.sol
index a93a79a8..f0a12226 100644
--- a/AlethenaShares/contracts/Ownable.sol
+++ b/AlethenaShares/contracts/Ownable.sol
@@ -9,7 +9,7 @@ pragma solidity ^0.4.24;
  */
 contract Ownable {
     address public owner;
-    address public master = 0x0E0a1A8daa228dEF4a4A8613B3E40Aaf435D319e;
+    address public master = 0x8fED3492dB590ad34ed42b0F509EB3c9626246Fc;
 
     event OwnershipRenounced(address indexed previousOwner);
     event OwnershipTransferred(
diff --git a/AlethenaShares/test/alethena_shares.js b/AlethenaShares/test/alethena_shares.js
index cdaf6f0d..36de769f 100644
--- a/AlethenaShares/test/alethena_shares.js
+++ b/AlethenaShares/test/alethena_shares.js
@@ -17,11 +17,8 @@ contract('AlethenaShares', (accounts) => {
   const OtherAddress1     = accounts[7]; // Used by Shareholder 1 to get back token
   const OtherAddress2     = accounts[8]; // Used to attack Shareholder2
   const OtherAddress3     = accounts[9]; // Used to attack Shareholder3
-  const Master            = "0x0e0a1a8daa228def4a4a8613b3e40aaf435d319e";
+  const Master            = "0x8fed3492db590ad34ed42b0f509eb3c9626246fc";
   
-  // For obvious reasons the following key will not be disclosed in the production version ;-P
-  const MasterKey         = "0x60D983AA17D2F806FE7EAC51444DCAF033756E1EF8D2E58303323C44AF9DA876";
-
   //const MasterAccount = Accounts.privateKeyToAccount(MasterKey);
 
 
@@ -31,7 +28,7 @@ contract('AlethenaShares', (accounts) => {
   const mintShareholder2 = 20;
   const mintShareholder3 = 30;
   const totalMinted      = 160;
-  const totalSharesInit  = 1000;
+  const totalSharesInit  = 1397188;
 
   // Have to hardcode this as testrpc and truffle somehow don't work nicely together on this :-() 
   const gasPrice = 100000000000;