diff --git a/leo.mk b/leo.mk
index 6e55084..d88a5cf 100755
--- a/leo.mk
+++ b/leo.mk
@@ -89,7 +89,7 @@ PRODUCT_COPY_FILES += \
 
 #GSM APN LIST
 PRODUCT_COPY_FILES += \
-    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml
+    device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
 
 # kernel modules
 PRODUCT_COPY_FILES += \
diff --git a/prebuilt/media_profiles.xml b/prebuilt/media_profiles.xml
index 2267bec..f4bdf0c 100644
--- a/prebuilt/media_profiles.xml
+++ b/prebuilt/media_profiles.xml
@@ -22,7 +22,7 @@
                          AudioDecoderCap)>
 <!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>
 <!ELEMENT EncoderProfile (Video, Audio)>
-<!ATTLIST EncoderProfile quality (hd|high|low) #REQUIRED>
+<!ATTLIST EncoderProfile quality (high|low) #REQUIRED>
 <!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>
 <!ATTLIST EncoderProfile duration (30|60) #REQUIRED>
 <!ELEMENT Video EMPTY>
@@ -77,10 +77,10 @@
 -->
 <MediaSettings>
     <!-- Each camcorder profile defines a set of predefined configuration parameters -->
-    <CamcorderProfiles>
-
+    <CamcorderProfiles cameraId="0">
+        <!--
         <EncoderProfile quality="hd" fileFormat="mp4" duration="60">
-            <Video codec="h264"
+            <Video codec="m4v"
                    bitRate="6000000"
                    width="1280"
                    height="720"
@@ -88,20 +88,20 @@
 
             <Audio codec="aac"
                     bitRate="96000"
-                    sampleRate="48000"
+                    sampleRate="16000"
                     channels="1" />
         </EncoderProfile>
-        
+        -->
         <EncoderProfile quality="high" fileFormat="mp4" duration="60">
-            <Video codec="m4v"
-                   bitRate="2000000"
-                   width="800"
+            <Video codec="h264"
+                   bitRate="3000000"
+                   width="720"
                    height="480"
-                   frameRate="30" />
+                   frameRate="24" />
 
             <Audio codec="aac"
-                   bitRate="48000"
-                   sampleRate="22050"
+                   bitRate="96000"
+                   sampleRate="16000"
                    channels="1" />
         </EncoderProfile>
 
@@ -122,10 +122,44 @@
         <ImageEncoding quality="90" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />
-        <ImageDecoding memCap="20000000" />
-
     </CamcorderProfiles>
 
+    <CamcorderProfiles cameraId="1">
+        <EncoderProfile quality="high" fileFormat="mp4" duration="60">
+            <Video codec="h264"
+                   bitRate="2000000"
+                   width="640"
+                   height="480"
+                   frameRate="24" />
+
+            <Audio codec="aac"
+                   bitRate="96000"
+                   sampleRate="16000"
+                   channels="1" />
+
+        </EncoderProfile>
+
+        <EncoderProfile quality="low" fileFormat="3gp" duration="30">
+            <Video codec="h263"
+                   bitRate="256000"
+                   width="176"
+                   height="144"
+                   frameRate="15" />
+
+            <Audio codec="amrnb"
+                   bitRate="12200"
+                   sampleRate="8000"
+                   channels="1" />
+        </EncoderProfile>
+
+        <ImageEncoding quality="90" />
+        <ImageEncoding quality="80" />
+        <ImageEncoding quality="70" />
+
+        <ImageDecoding memCap="10000000" />
+
+        <Camera previewFrameRate="0" />
+    </CamcorderProfiles>
 
     <EncoderOutputFileFormat name="3gp" />
     <EncoderOutputFileFormat name="mp4" />
@@ -137,25 +171,25 @@
     -->
     <VideoEncoderCap name="h264" enabled="true"
         minBitRate="64000" maxBitRate="6000000"
-        minFrameWidth="176" maxFrameWidth="1280"
-        minFrameHeight="144" maxFrameHeight="720"
+        minFrameWidth="176" maxFrameWidth="800"
+        minFrameHeight="144" maxFrameHeight="480"
         minFrameRate="1" maxFrameRate="30" />
 
     <VideoEncoderCap name="h263" enabled="true"
-        minBitRate="64000" maxBitRate="2000000"
+        minBitRate="64000" maxBitRate="6000000"
         minFrameWidth="176" maxFrameWidth="800"
         minFrameHeight="144" maxFrameHeight="480"
         minFrameRate="1" maxFrameRate="30" />
 
     <VideoEncoderCap name="m4v" enabled="true"
-        minBitRate="64000" maxBitRate="2000000"
-        minFrameWidth="176" maxFrameWidth="800"
-        minFrameHeight="144" maxFrameHeight="480"
+        minBitRate="64000" maxBitRate="8000000"
+        minFrameWidth="176" maxFrameWidth="1280"
+        minFrameHeight="144" maxFrameHeight="720"
         minFrameRate="1" maxFrameRate="30" />
 
     <AudioEncoderCap name="aac" enabled="true"
         minBitRate="8192" maxBitRate="96000"
-        minSampleRate="8000" maxSampleRate="48000"
+        minSampleRate="8000" maxSampleRate="16000"
         minChannels="1" maxChannels="1" />
 
     <AudioEncoderCap name="amrwb" enabled="true"
@@ -177,4 +211,4 @@
     -->
     <VideoDecoderCap name="wmv" enabled="false"/>
     <AudioDecoderCap name="wma" enabled="false"/>
-</MediaSettings>
\ No newline at end of file
+</MediaSettings>
diff --git a/system.prop b/system.prop
index 367877a..e06de73 100755
--- a/system.prop
+++ b/system.prop
@@ -59,3 +59,5 @@ ro.opengles.version=131072
 
 ro.media.dec.jpeg.memcap=20000000
 
+# AGPS options
+ro.ril.def.agps.mode=2