diff --git a/README.md b/README.md
index 059aedf5c..ede3921bc 100644
--- a/README.md
+++ b/README.md
@@ -2,39 +2,39 @@
  
 * [Should I use Chronicle Queue or Chronicle Map](https://github.com/OpenHFT/Chronicle-Map#should-i-use-chronicle-queue-or-chronicle-map)
 * [What is the difference between SharedHashMap and Chronicle Map](https://github.com/OpenHFT/Chronicle-Map#what-is-the-difference-between-sharedhashmap-and-chronicle-map)
-* [Overview](https://github.com/OpenHFT/Chronicle-Map/wiki#overview)
-* [Object Construction](https://github.com/OpenHFT/Chronicle-Map/wiki#construction)
- *  [Simple Construction](https://github.com/OpenHFT/Chronicle-Map/wiki#simple-construction)
- *   [Flow Interface](https://github.com/OpenHFT/Chronicle-Map/wiki#flow-interface)
- *  [Sharing Data Between Two or More Maps](https://github.com/OpenHFT/Chronicle-Map/wiki#sharing-data-between-two-or-more-maps)
- *   [Entries](https://github.com/OpenHFT/Chronicle-Map/wiki#entries)
- *   [Chronicle Map Interface](https://github.com/OpenHFT/Chronicle-Map/wiki#chronicle-map-interface)
-* [Serialization](https://github.com/OpenHFT/Chronicle-Map/wiki#serialization)
-  *   [Simple Types](https://github.com/OpenHFT/Chronicle-Map/wiki#simple-types)
-  *   [Complex Types](https://github.com/OpenHFT/Chronicle-Map/wiki#complex-types)
-* [Close](https://github.com/OpenHFT/Chronicle-Map/wiki#close)
-* [TCP / UDP Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#tcp--udp-replication)
- * [TCP / UDP Background.](https://github.com/OpenHFT/Chronicle-Map/wiki#tcp--udp-background)
- *   [How to setup UDP Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#how-to-setup-udp-replication)
- *  [TCP/IP Throttling](https://github.com/OpenHFT/Chronicle-Map/wiki#tcpip--throttling)
- *   [Replication How it works](https://github.com/OpenHFT/Chronicle-Map/wiki#replication-how-it-works)
- *  [Multiple Chronicle Maps on a the same server with Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#multiple-chronicle-maps-on-a-the-same-server-with-replication)
- *   [Identifier for Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#identifier-for-replication)
- *   [Bootstrapping](https://github.com/OpenHFT/Chronicle-Map/wiki#bootstrapping)
-* [Clustering](https://github.com/OpenHFT/Chronicle-Map/wiki#cluster)
+* [Overview](https://github.com/OpenHFT/Chronicle-Map#overview)
+* [Object Construction](https://github.com/OpenHFT/Chronicle-Map#construction)
+ *  [Simple Construction](https://github.com/OpenHFT/Chronicle-Map#simple-construction)
+ *   [Flow Interface](https://github.com/OpenHFT/Chronicle-Map#flow-interface)
+ *  [Sharing Data Between Two or More Maps](https://github.com/OpenHFT/Chronicle-Map#sharing-data-between-two-or-more-maps)
+ *   [Entries](https://github.com/OpenHFT/Chronicle-Map#entries)
+ *   [Chronicle Map Interface](https://github.com/OpenHFT/Chronicle-Map#chronicle-map-interface)
+* [Serialization](https://github.com/OpenHFT/Chronicle-Map#serialization)
+  *   [Simple Types](https://github.com/OpenHFT/Chronicle-Map#simple-types)
+  *   [Complex Types](https://github.com/OpenHFT/Chronicle-Map#complex-types)
+* [Close](https://github.com/OpenHFT/Chronicle-Map#close)
+* [TCP / UDP Replication](https://github.com/OpenHFT/Chronicle-Map#tcp--udp-replication)
+ * [TCP / UDP Background.](https://github.com/OpenHFT/Chronicle-Map#tcp--udp-background)
+ *   [How to setup UDP Replication](https://github.com/OpenHFT/Chronicle-Map#how-to-setup-udp-replication)
+ *  [TCP/IP Throttling](https://github.com/OpenHFT/Chronicle-Map#tcpip--throttling)
+ *   [Replication How it works](https://github.com/OpenHFT/Chronicle-Map#replication-how-it-works)
+ *  [Multiple Chronicle Maps on a the same server with Replication](https://github.com/OpenHFT/Chronicle-Map#multiple-chronicle-maps-on-a-the-same-server-with-replication)
+ *   [Identifier for Replication](https://github.com/OpenHFT/Chronicle-Map#identifier-for-replication)
+ *   [Bootstrapping](https://github.com/OpenHFT/Chronicle-Map#bootstrapping)
+* [Clustering](https://github.com/OpenHFT/Chronicle-Map#cluster)
 
 #### Examples
 
-* [Replicating data between process on different servers](https://github.com/OpenHFT/Chronicle-Map/wiki#example--replicating-data-between-process-on-different-servers)
-  * [Identifier](https://github.com/OpenHFT/Chronicle-Map/wiki#identifier)
-  * [Port](https://github.com/OpenHFT/Chronicle-Map/wiki#port)
-  * [Heart Beat Interval](https://github.com/OpenHFT/Chronicle-Map/wiki#heart-beat-interval)
+* [Replicating data between process on different servers](https://github.com/OpenHFT/Chronicle-Map#example--replicating-data-between-process-on-different-servers)
+  * [Identifier](https://github.com/OpenHFT/Chronicle-Map#identifier)
+  * [Port](https://github.com/OpenHFT/Chronicle-Map#port)
+  * [Heart Beat Interval](https://github.com/OpenHFT/Chronicle-Map#heart-beat-interval)
 
 #### Performance Topics
 
-* [Chronicle Map with Large Data ](https://github.com/OpenHFT/Chronicle-Map/wiki#chronicle-map-with-large-data)
-* [Better to use small keys](https://github.com/OpenHFT/Chronicle-Map/wiki#better-to-use-small-keys)
-* [ConcurrentHashMap v ChronicleMap](https://github.com/OpenHFT/Chronicle-Map/wiki#concurrenthashmap-v-chroniclemap)
+* [Chronicle Map with Large Data ](https://github.com/OpenHFT/Chronicle-Map#chronicle-map-with-large-data)
+* [Better to use small keys](https://github.com/OpenHFT/Chronicle-Map#better-to-use-small-keys)
+* [ConcurrentHashMap v ChronicleMap](https://github.com/OpenHFT/Chronicle-Map#concurrenthashmap-v-chroniclemap)
 
 ### Overview
 A Chronicle Map implements the java.util.concurrent.ConcurrentMap, so on the face of it it works just like any other java.util.concurrent.ConcurrentMap, however there are a few differences.