diff --git a/a20/derp_a20.mk b/a20/derp_a20.mk
new file mode 100644
index 0000000..35b2b6d
--- /dev/null
+++ b/a20/derp_a20.mk
@@ -0,0 +1,7 @@
+# Auto-Generated by device/samsung/a20/setup.sh
+$(call inherit-product, device/samsung/a20/full_a20.mk)
+$(call inherit-product, vendor/derp/config/common_full_phone.mk)
+PRODUCT_NAME := derp_a20
+# Additional Props
+TARGET_FACE_UNLOCK_SUPPORTED := true
+TARGET_BOOT_ANIMATION_RES := 720
diff --git a/a20e/derp_a20e.mk b/a20e/derp_a20e.mk
new file mode 100644
index 0000000..1059d4d
--- /dev/null
+++ b/a20e/derp_a20e.mk
@@ -0,0 +1,8 @@
+# Auto-Generated by device/samsung/a20e/setup.sh
+$(call inherit-product, device/samsung/a20e/full_a20e.mk)
+$(call inherit-product, vendor/derp/config/common_full_phone.mk)
+PRODUCT_NAME := derp_a20e
+
+# Additional Props
+TARGET_FACE_UNLOCK_SUPPORTED := true
+TARGET_BOOT_ANIMATION_RES := 720
diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSInfoService.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSInfoService.kt
index e637016..322afea 100644
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSInfoService.kt
+++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSInfoService.kt
@@ -37,7 +37,6 @@ open class FPSInfoService : Service() {
     private val TAG = "FPSInfoService"
     private var fPSInfoString: String? = null
     private var mDreamManager: IDreamManager? = null
-    private var mRunning : Boolean = false
 
     private inner class FPSView(c: Context) : View(c) {
         private val mOnlinePaint: Paint?
@@ -245,5 +244,6 @@ open class FPSInfoService : Service() {
     }
     companion object {
         private var surfaceFlingerFPS: SurfaceFlingerFPS? = null
+        private var mRunning : Boolean = false
     }
 }
\ No newline at end of file
diff --git a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSTileService.kt b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSTileService.kt
index e00b30a..52f45d1 100644
--- a/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSTileService.kt
+++ b/universal7885-common/apps/SamsungParts/src/com/eurekateam/samsungextras/fps/FPSTileService.kt
@@ -21,6 +21,7 @@ import android.service.quicksettings.TileService
 
 // TODO: Add FPS drawables
 class FPSTileService : TileService() {
+    private val fpsinfo = Intent(this, FPSInfoService::class.java)
     private var isShowing = false
     override fun onStartListening() {
         super.onStartListening()
@@ -30,7 +31,6 @@ class FPSTileService : TileService() {
     }
 
     override fun onClick() {
-        val fpsinfo = Intent(this, FPSInfoService::class.java)
         if (!isShowing) startService(fpsinfo) else stopService(fpsinfo)
         isShowing = !isShowing
         updateTile()
diff --git a/universal7885-common/derp.dependecies b/universal7885-common/derp.dependecies
new file mode 100644
index 0000000..e69de29
diff --git a/universal7885-common/vendor_name b/universal7885-common/vendor_name
deleted file mode 100644
index 7c29013..0000000
--- a/universal7885-common/vendor_name
+++ /dev/null
@@ -1 +0,0 @@
-derp
\ No newline at end of file