diff --git a/leo.mk b/leo.mk
index 4406805..7aa3a63 100755
--- a/leo.mk
+++ b/leo.mk
@@ -28,20 +28,14 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     device/htc/leo/init.leo.rc:root/init.leo.rc \
 
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.com.google.clientidbase=android-tmobile-us \
-    ro.com.google.clientidbase.vs=android-hms-tmobile-us \
-    ro.com.google.clientidbase.ms=android-hms-tmobile-us \
-    ro.com.google.locationfeatures=1 \
-    ro.com.google.networklocation=1 \
-    ro.com.google.gmsversion=2.2_r6 \
-    ro.setupwizard.enable_bypass=1 \
-    dalvik.vm.lockprof.threshold=500 \
-    dalvik.vm.dexopt-flags=m=y
-    ro.media.dec.jpeg.memcap=20000000 \
-    dalvik.vm.lockprof.threshold=500 \
-    dalvik.vm.dexopt-flags=m=y \
-    ro.opengles.version=131072
+PRODUCT_PROPERTY_OVERRIDES := \
+    ro.sf.lcd_density=240 \
+    rild.libpath=/system/lib/libhtc_ril.so \
+    wifi.interface=eth0 \
+    wifi.supplicant_scan_interval=15 \
+    ro.ril.hsxpa=2 \
+    ro.ril.gprsclass=10
+
 
 
 # Default network type.
@@ -53,6 +47,11 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.ril.disable.power.collapse = 1
 
+# The OpenGL ES API level that is natively supported by this device.
+# This is a 16.16 fixed point number
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.opengles.version=131072
+
 # For PDP overlap problem
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.ril.avoid.pdp.overlap = 1
@@ -100,6 +99,7 @@ PRODUCT_PACKAGES += \
     gralloc.qsd8k \
     copybit.qsd8k \
     gps.leo \
+    libhtc_ril_wrapper \
     libOmxCore \
     libOmxVidEnc
 
diff --git a/libgps b/libgps
new file mode 160000
index 0000000..5235bae
--- /dev/null
+++ b/libgps
@@ -0,0 +1 @@
+Subproject commit 5235baed73e82f51d372026604bc658d18f609ee
diff --git a/libhtc_ril_wrapper b/libhtc_ril_wrapper
new file mode 160000
index 0000000..13ae855
--- /dev/null
+++ b/libhtc_ril_wrapper
@@ -0,0 +1 @@
+Subproject commit 13ae855f761b0c15ad0633d9dba8a2167d841470