diff --git a/common/consistenthash/consistenthash.go b/common/consistenthash/consistenthash.go
index dde99a9..3f96e8a 100644
--- a/common/consistenthash/consistenthash.go
+++ b/common/consistenthash/consistenthash.go
@@ -22,6 +22,16 @@ func (r *Ring) search(key string) int {
     // YOUR CODE GOES HERE //
     /////////////////////////
 
+	minHash := hashId(key)
+
+	//Return node with smallest hash bigger than minHash
+	//Assumes array is ordered
+	for i, n := range r.Nodes{
+		if(n.HashId > minHash){
+			return i
+		}
+	}
+
     return 0
 }
 
diff --git a/dynamo/cache.go b/dynamo/cache.go
index 0483a39..0f751e4 100644
--- a/dynamo/cache.go
+++ b/dynamo/cache.go
@@ -12,6 +12,7 @@ import (
 // Cache is the struct that handle all the data storage for the dynamo server.
 type Cache struct {
     data map[string]string
+    timestamps map[string]int64
     sync.Mutex
 }
 
@@ -20,6 +21,7 @@ func NewCache() *Cache {
     var s Cache
 
     s.data = make(map[string]string)
+    s.timestamps = make(map[string]int64)
 
     return &s
 }
@@ -29,7 +31,7 @@ func NewCache() *Cache {
 func (cache *Cache) Get(key string) (value string, timestamp int64) {
     cache.Lock()
     value = cache.data[key]
-    timestamp = 0
+    timestamp = cache.timestamps[key]
     cache.Unlock()
 
     log.Printf("[CACHE] Getting Key '%v' with Value '%v' @ timestamp '%v'\n", key, value, timestamp)
@@ -43,6 +45,7 @@ func (cache *Cache) Put(key string, value string, timestamp int64) {
 
     cache.Lock()
     cache.data[key] = value
+    cache.timestamps[key] = timestamp
     cache.Unlock()
 
     return
@@ -52,6 +55,6 @@ func (cache *Cache) Put(key string, value string, timestamp int64) {
 // except for testing purposes.
 func (cache *Cache) getAll() (data map[string]string, timestamps map[string]int64) {
     data = cache.data
-    timestamps = make(map[string]int64)
+    timestamps = cache.timestamps
     return data, timestamps
 }
diff --git a/dynamo/coordinator.go b/dynamo/coordinator.go
index 408cc9e..e6c8977 100644
--- a/dynamo/coordinator.go
+++ b/dynamo/coordinator.go
@@ -186,13 +186,24 @@ func (server *Server) Voting(key string, quorum int) (string, error) {
 
 // aggregateVotes will select the right value from the votes received.
 func aggregateVotes(votes []*vote) (result string) {
+
+	var highestTS int64
+	highestTS = 0
+
 	for _, vote := range votes {
 		log.Printf("[COORDINATOR] Vote: %v\n", vote.value)
+		if(vote.timestamp > highestTS){
+			result = vote.value
+			highestTS = vote.timestamp
+		}
 	}
 
 	/////////////////////////
 	// YOUR CODE GOES HERE //
 	/////////////////////////
-	result = votes[0].value
+
+	//result should already be updated
+	//result = votes[0].value
+	
 	return
 }