diff --git a/BoardConfig.mk b/BoardConfig.mk
index 00d2eb6..674d01f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -18,15 +18,11 @@
 -include device/samsung/n80xx-common/BoardConfigCommon.mk
 
 # Inline kernel building
-#FIXME NOT READY YET - NEEDS DEFCONFIG
-#TARGET_KERNEL_SOURCE := kernel/samsung/n8000
-#TARGET_KERNEL_CONFIG := cyanogenmod_n8013_defconfig
-
 TARGET_KERNEL_SOURCE := kernel/samsung/smdk4412
 TARGET_KERNEL_CONFIG := cyanogenmod_n8013_defconfig
 
 # assert
-TARGET_OTA_ASSERT_DEVICE := c0,p4notewifi,p4notewifiww,n8013,GT-N8013
+TARGET_OTA_ASSERT_DEVICE := c0,p4notewifi,p4notewifiww,n8013,GT-N8013,n8010,GT-N8010
 
 #Bluetooth
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/samsung/n8013/bluetooth
diff --git a/configs/gps.conf b/configs/gps.conf
index 21fa8b4..4822c31 100644
--- a/configs/gps.conf
+++ b/configs/gps.conf
@@ -1,6 +1 @@
-NTP_SERVER=north-america.pool.ntp.org
 XTRA_SERVER_1=http://gllto.glpals.com/7day/glo/v2/latest/lto2.dat
-XTRA_SERVER_2=http://gllto.glpals.com/7day/glo/v2/latest/lto2.dat
-XTRA_SERVER_3=http://gllto.glpals.com/7day/glo/v2/latest/lto2.dat
-SUPL_HOST=supl.google.com
-SUPL_PORT=7276
diff --git a/configs/gps.xml b/configs/gps.xml
index 1e74b52..6497d53 100644
--- a/configs/gps.xml
+++ b/configs/gps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/glconfig.xsd" >
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
   <!--HAL Confguration  -->
   <hal
        acPortName="/dev/ttySAC1"
@@ -7,18 +7,12 @@
        gpioNStdbyPath="/sys/class/sec/gps/GPS_PWR_EN/value"
        gpioNResetPath="/sys/class/sec/gps/GPS_nRST/value"
        gpioDelayMs="250"
-       acNvStoDir="/data/"
-       FactoryTestFilePath="/data/"
+       acNvStoDir="/data/gps/"
 
-       acLogDirectory="/sdcard/gps/broadcom/"
+       acLogDirectory="/data/gps/log/"
 
-       TISEnabled="false"
        LPmode="false"
-       cp-cold-start="false"
-       cp-guard-time-sec="1"
-
        ReAidingType="0"
-
        arp-supl-enable="false"
        arp-supl-cap-msb="false"
        arp-supl-cap-msa="false"
@@ -33,7 +27,6 @@
        SuplUT2Seconds="20"
        SuplUT3Seconds="20"
        SuplVersion="1"
-
        LbsEnable="false"
        LbsLocal="false"
        LbsServer="BCMLS2.glpals.com"
@@ -44,12 +37,12 @@
        acLtoDir="/data/gps/"
        LbsSyncLtoThresholdDays="1"
        LbsTAC="10101222"
+       ctrlPipe="/data/gps/glgpsctrl"
        LbsWlanEnable="false"
-       
-       AssertEnabled="false"
-       
+       SensorsEnable="false"
+       SensorsPowerSave="false"
+       SensorsLog="false"
    />
-
   <gll
        LogPriMask="LOG_INFO"
        LogFacMask="LOG_GLLAPI | LOG_NMEA | LOG_RAWDATA"
@@ -63,5 +56,4 @@
        EnableLowPowerEls="false"
        EnableLowPowerPmm="true"
    />
-
-</glgps>
+</glgps>
\ No newline at end of file
diff --git a/n8013.mk b/n8013.mk
index de5270d..465de25 100644
--- a/n8013.mk
+++ b/n8013.mk
@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-$(call inherit-product, device/samsung/n80xx-common/n80xx-common.mk)
-
 LOCAL_PATH := device/samsung/n8013
 
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
@@ -25,9 +23,6 @@ DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 PRODUCT_COPY_FILES += \
     device/samsung/n8013/rootdir/init.target.rc:root/init.target.rc
 
-# Audio
-PRODUCT_COPY_FILES += \
-    device/samsung/n80xx-common/configs/tiny_hw.xml:system/etc/sound/GT-N8013
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
@@ -37,3 +32,5 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     device/samsung/n8013/configs/gps.conf:system/etc/gps.conf \
     device/samsung/n8013/configs/gps.xml:system/etc/gps.xml
+
+$(call inherit-product, device/samsung/n80xx-common/n80xx-common.mk)
\ No newline at end of file
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index 004e52a..9f79f6e 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -6,6 +6,9 @@ on post-fs-data
     # make param block device link for SysScope
     symlink /dev/block/mmcblk0p4 /dev/block/param
 
+    # Restorecon
+    restorecon_recursive /efs
+
 on boot
     setprop ro.radio.noril yes
 
@@ -17,12 +20,13 @@ service icd /system/bin/icd
     onrestart exec icd_check
 
 # GPS
-service gpsd /system/bin/logwrapper /system/bin/gpsd -c /system/etc/gps.xml
+service gpsd /system/bin/gpsd -c /system/etc/gps.xml
     class main
     socket gps seqpacket 0660 gps system
     user gps
     group system inet sdcard_rw
-
+    seclabel u:r:gpsd:s0
+    
 service dmb /system/bin/dmbserver
     class main
     user system
@@ -32,9 +36,4 @@ service dmb /system/bin/dmbserver
 #service TvoutService_C /system/bin/bintvoutservice
 #     class main
 #     user system
-#     group graphics
-
-service SecTVOutService /system/bin/TVOutDummy
-    class main
-    group graphics
-    oneshot
+#     group graphics
\ No newline at end of file
diff --git a/system.prop b/system.prop
index 838ef90..ec42c2f 100644
--- a/system.prop
+++ b/system.prop
@@ -1,6 +1,6 @@
 #
 # system.prop for smdk4x12
 #
-dalvik.vm.dexopt-data-only=1
 ro.sf.lcd_density=160
 ro.lcd_min_brightness=20
+ro.cm.hardware.cabc=/sys/class/mdnie/mdnie/cabc
\ No newline at end of file