diff --git a/conf/3.x/solrconfig.xml b/conf/3.x/solrconfig.xml
index b5e5627..cfbdde9 100644
--- a/conf/3.x/solrconfig.xml
+++ b/conf/3.x/solrconfig.xml
@@ -102,7 +102,7 @@
        replication is in use, this should match the replication
        configuration.
     -->
-  <!-- <dataDir>${solr.data.dir:}</dataDir> -->
+  <dataDir>${solr.data.dir:}</dataDir>
 
 
   <!-- The DirectoryFactory to use for indexes.
@@ -132,7 +132,7 @@
 
     <useCompoundFile>false</useCompoundFile>
 
-    <mergeFactor>4</mergeFactor>
+    <mergeFactor>10</mergeFactor>
     <!-- Sets the amount of RAM that may be used by Lucene indexing
          for buffering added documents and deletions before they are
          flushed to the Directory.  -->
@@ -142,8 +142,7 @@
       -->
     <!-- <maxBufferedDocs>1000</maxBufferedDocs> -->
 
-    <maxMergeDocs>2147483647</maxMergeDocs>
-    <maxFieldLength>100000</maxFieldLength>
+    <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
 
     <!-- Expert: Merge Policy 
@@ -161,7 +160,9 @@
          Other implementations of MergePolicy must have a no-argument
          constructor
       -->
-    <mergePolicy class="org.apache.lucene.index.LogByteSizeMergePolicy"/>
+    <!--
+       <mergePolicy class="org.apache.lucene.index.TieredMergePolicy"/>
+       -->
 
     <!-- Expert: Merge Scheduler
 
@@ -193,7 +194,7 @@
          More details on the nuances of each LockFactory...
          http://wiki.apache.org/lucene-java/AvailableLockFactories
     -->
-    <lockType>single</lockType>
+    <lockType>native</lockType>
 
     <!-- Expert: Controls how often Lucene loads terms into memory
          Default is 128 and is likely good for most everyone.
@@ -278,7 +279,7 @@
 
        For more details see http://wiki.apache.org/solr/SolrJmx
     -->
-  <!-- <jmx /> -->
+  <jmx />
   <!-- If you want to connect to a particular server, specify the
        agentId 
     -->
@@ -305,10 +306,12 @@
                    since a document was added before automaticly
                    triggering a new commit. 
       -->
-    <autoCommit> 
-      <maxDocs>10000</maxDocs>
-      <maxTime>120000</maxTime> 
-    </autoCommit>
+    <!--
+       <autoCommit> 
+         <maxDocs>10000</maxDocs>
+         <maxTime>1000</maxTime> 
+       </autoCommit>
+      -->
 
     <!-- Update Related Event Listeners
          
@@ -1031,19 +1034,19 @@
        this is just a slave and remove  the <lst name="slave"> section
        if this is just a master.
     -->
-  <!--
-     <requestHandler name="/replication" class="solr.ReplicationHandler" >
-       <lst name="master">
-         <str name="replicateAfter">commit</str>
-         <str name="replicateAfter">startup</str>
-         <str name="confFiles">schema.xml,stopwords.txt</str>
-       </lst>
-       <lst name="slave">
-         <str name="masterUrl">http://localhost:8983/solr/replication</str>
-         <str name="pollInterval">00:00:60</str>
-       </lst>
-     </requestHandler>
-    -->
+  <requestHandler name="/replication" class="solr.ReplicationHandler" >
+    <lst name="master">
+      <str name="enable">${enable.master:false}</str>
+      <str name="replicateAfter">commit</str>
+      <str name="replicateAfter">startup</str>
+      <str name="confFiles">${conf_files}</str>
+   </lst>
+   <lst name="slave">
+     <str name="enable">${enable.slave:false}</str>
+     <str name="masterUrl">${master_core_url}/${solr.core.name}/replication</str>
+     <str name="pollInterval">${poll_time:00:00:60}</str>
+   </lst>
+  </requestHandler>
 
   <!-- Search Components
 
diff --git a/conf/3.x/solrcore.properties b/conf/3.x/solrcore.properties
new file mode 100644
index 0000000..76f7273
--- /dev/null
+++ b/conf/3.x/solrcore.properties
@@ -0,0 +1,6 @@
+#solrcore.properties for this specific core
+enable.master=true
+enable.slave=false
+poll_time=00:00:60
+master_core_url=http://localhost:8983/solr
+conf_files=schema.xml,mapping-ISOLatin1Accent.txt,protwords.txt,stopwords.txt,synonyms.txt,elevate.xml
\ No newline at end of file