diff --git a/SHAMap.cpp b/SHAMap.cpp
index a430e3c66f..4deda9bacb 100644
--- a/SHAMap.cpp
+++ b/SHAMap.cpp
@@ -12,12 +12,14 @@ SHAMap::SHAMap(int leafDataSize, int leafDataOffset) : mLeafDataSize(leafDataSiz
 void SHAMap::dirtyUp(const uint256& id, const std::vector<SHAMapInnerNode::pointer>& path)
 { // walk the tree up from through the inner nodes to the root
   // update linking hashes and add nodes to dirty list
+	if(mDirtyInnerNodes==NULL) return;
+
 	std::vector<SHAMapInnerNode::pointer>::const_reverse_iterator it;
 
 	it = path.rbegin();
 	if(it == path.rend()) return;
 	
-	mDirtyInnerNodes[**it]=*it;
+	(*mDirtyInnerNodes)[**it]=*it;
 	uint256 hVal=(*it)->getNodeHash();
 	if(hVal==0)
 		mInnerNodeByID.erase(**it);
@@ -26,7 +28,7 @@ void SHAMap::dirtyUp(const uint256& id, const std::vector<SHAMapInnerNode::point
 	{
 		if(!(*it)->setChildHash((*it)->selectBranch(id), hVal))
 			return;
-		mDirtyInnerNodes[**it]=*it;
+		(*mDirtyInnerNodes)[**it]=*it;
 		hVal = (*it)->getNodeHash();
 		if(hVal == 0) mInnerNodeByID.erase(**it);
 	}
@@ -132,11 +134,6 @@ SHAMapInnerNode::pointer SHAMap::getInner(const SHAMapNode &id, const uint256& h
 	return node;
 }
 
-SHAMapItem::SHAMapItem(const uint256& tag) : mTag(tag)
-{
-	mData.insert(mData.end(), tag.begin(), tag.end());
-}
-
 SHAMapItem::SHAMapItem(const uint256& tag, const std::vector<unsigned char>& data) : mTag(tag), mData(data)
 { ; }
 
@@ -300,7 +297,7 @@ void SHAMap::dump()
 {
 }
 
-void TestSHAMap()
+bool SHAMap::TestSHAMap()
 {
  uint256 h1, h2, h3, h4, h5;
  h1.SetHex("436ccbac3347baa1f1e53baeef1f43334da88f1f6d70d963b833afd6dfa289fe");
@@ -310,7 +307,7 @@ void TestSHAMap()
  h5.SetHex("092891fe4ef6cee585fdc6fda0e09eb4d386363158ec3321b8123e5a772c6ca7");
 
  SHAMap sMap(32);
- SHAMapItem i1(h1), i2(h2), i3(h3), i4(h4), i5(h5);
+// SHAMapItem i1(h1), i2(h2), i3(h3), i4(h4), i5(h5);
  
  sMap.dump();
 }
diff --git a/SHAMap.h b/SHAMap.h
index 985a094417..e363acda3c 100644
--- a/SHAMap.h
+++ b/SHAMap.h
@@ -69,10 +69,14 @@ private:
 	std::vector<unsigned char> mData;
 
 public:
-	SHAMapItem(const uint256& tag); // tag is data
+
+	// for transactions
 	SHAMapItem(const uint256& tag, const std::vector<unsigned char>& data);
 	SHAMapItem(const std::vector<unsigned char>& data); // tag by hash
 
+	// for account balances
+	SHAMapItem(const uint160& tag, const std::vector<unsigned char>& data);
+
 	const uint256& getTag(void) const { return mTag; }
 	std::vector<unsigned char> getData(void) const { return mData; }
 	const std::vector<unsigned char>& peekData(void) const { return mData; }
@@ -169,12 +173,12 @@ public:
 	typedef boost::shared_ptr<SHAMap> pointer;
 
 private:
-	int mLeafDataSize, mLeafDataOffset;
+	int mLeafDataSize, mLeafDataOffset, mSeq;
 	mutable boost::recursive_mutex mLock;
 	std::map<SHAMapNode, SHAMapLeafNode::pointer> mLeafByID;
 	std::map<SHAMapNode, SHAMapInnerNode::pointer> mInnerNodeByID;
-	std::map<SHAMapNode, SHAMapLeafNode::pointer> mDirtyLeafNodes;
-	std::map<SHAMapNode, SHAMapInnerNode::pointer> mDirtyInnerNodes;
+	boost::shared_ptr<std::map<SHAMapNode, SHAMapLeafNode::pointer> > mDirtyLeafNodes;
+	boost::shared_ptr<std::map<SHAMapNode, SHAMapInnerNode::pointer> > mDirtyInnerNodes;
 
 	SHAMapInnerNode::pointer root;