diff --git a/conf/autoload_configs/modules.conf.xml b/conf/autoload_configs/modules.conf.xml
index 4512729586..8cf38e9351 100644
--- a/conf/autoload_configs/modules.conf.xml
+++ b/conf/autoload_configs/modules.conf.xml
@@ -66,7 +66,7 @@
     <!--For icecast/mp3 streams/files-->
     <!--<load module="mod_shout"/>-->
     <!--For local streams (play all the files in a directory)-->
-    <!--<load module="mod_local_stream"/>-->
+    <load module="mod_local_stream"/>
 
     <!-- Timers -->
 
diff --git a/conf/dialplan/default.xml b/conf/dialplan/default.xml
index e7791135d4..4d1c3759cc 100644
--- a/conf/dialplan/default.xml
+++ b/conf/dialplan/default.xml
@@ -147,19 +147,6 @@
       </condition>
     </extension>
     
-    <!--
-	if the number starts with a *393 then strip the *393 
-	and dial the remainder of the number out our "fwd" gateway
-    -->
-    <extension name="FWD">
-      <condition field="destination_number" expression="^\*393([\*\d]+)$">
-	<!-- Just incase they are using Asterisk let's disable VAD and only use G.711 -->
-	<action application="export" data="rtp_disable_vad_out=true"/>
-	<action application="export" data="absolute_codec_string=PCMU@20i,PCMA@20i"/>
-	<action application="bridge" data="sofia/gateway/fwd/$1"/>
-      </condition>
-    </extension> 
-    
     <!-- a sample IVR  -->
     <extension name="IVR_Demo">
       <condition field="destination_number" expression="5000">
@@ -194,6 +181,12 @@
     </extension>
     -->
 
+    <extension name="hold_music">
+      <condition field="destination_number" expression="^9999$">
+	<action application="answer"/>
+	<action application="playback" data="local_stream://moh_${read_rate}"/>
+      </condition>
+    </extension>
 
     <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/>
 
diff --git a/conf/vars.xml b/conf/vars.xml
index 4ca1f228d3..f2d74c2ddd 100644
--- a/conf/vars.xml
+++ b/conf/vars.xml
@@ -15,7 +15,7 @@
        containing the "subscriptions" table.
        used by: dingaling.conf.xml enum.conf.xml 
   --> 
-  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=PCMU@20i,PCMA@20i"/>
+  <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU@20i,PCMA@20i"/>
   <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/>
   <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/>
   <!-- bind_server_ip