diff --git a/src/AmtPtpDeviceUsbKm/include/AppleDefinition.h b/src/AmtPtpDeviceUsbKm/include/AppleDefinition.h
index 8920326..3203f7b 100644
--- a/src/AmtPtpDeviceUsbKm/include/AppleDefinition.h
+++ b/src/AmtPtpDeviceUsbKm/include/AppleDefinition.h
@@ -156,8 +156,8 @@ static const struct BCM5974_CONFIG Bcm5974ConfigTable[] = {
 		{ SN_PRESSURE, 0, 300 },
 		{ SN_WIDTH, 0, 2048 },
 		// Oversampled - this is fine for a trackpad
-		{ SN_COORD, -7600, 8200 },
-		{ SN_COORD, -200, 9500 },
+		{ SN_COORD, -10000, 10000 },
+		{ SN_COORD, -2000, 10000 },
 		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
 	},
 	/* 13 inch */
@@ -192,8 +192,8 @@ static const struct BCM5974_CONFIG Bcm5974ConfigTable[] = {
 		{ SN_PRESSURE, 0, 300 },
 		{ SN_WIDTH, 0, 2048 },
 		// Oversampled - this is fine for a trackpad
-		{ SN_COORD, -7600, 8200 },
-		{ SN_COORD, -200, 9500 },
+		{ SN_COORD, -10000, 10000 },
+		{ SN_COORD, -2000, 10000 },
 		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
 	},
 	{
@@ -204,8 +204,8 @@ static const struct BCM5974_CONFIG Bcm5974ConfigTable[] = {
 		{ SN_PRESSURE, 0, 300 },
 		{ SN_WIDTH, 0, 2048 },
 		// Oversampled - this is fine for a trackpad
-		{ SN_COORD, -7600, 8200 },
-		{ SN_COORD, -200, 9500 },
+		{ SN_COORD, -10000, 10000 },
+		{ SN_COORD, -2000, 10000 },
 		{ SN_ORIENT, -MAX_FINGER_ORIENTATION, MAX_FINGER_ORIENTATION }
 	},
 	{
diff --git a/src/AmtPtpDeviceUsbKm/include/metadata/WellspringT2.h b/src/AmtPtpDeviceUsbKm/include/metadata/WellspringT2.h
index b55ab84..1c53e6d 100644
--- a/src/AmtPtpDeviceUsbKm/include/metadata/WellspringT2.h
+++ b/src/AmtPtpDeviceUsbKm/include/metadata/WellspringT2.h
@@ -25,7 +25,7 @@
 		/* Begin of 4 bytes */ \
 		/* Size is hard-coded at this moment */ \
 		USAGE_PAGE, 0x01, /* Usage Page: Generic Desktop */ \
-		LOGICAL_MAXIMUM_2, 0x80, 0x3e, /* Logical Maximum: 16000 (See defintion) */ \
+		LOGICAL_MAXIMUM_2, 0x20, 0x4e, /* Logical Maximum: 20000 (See defintion) */ \
 		REPORT_SIZE, 0x10, /* Report Size: 0x10 (2 bytes) */ \
 		UNIT_EXPONENT, 0x0e, /* Unit exponent: -2 */ \
 		UNIT, 0x11, /* Unit: SI Length (cm) */ \
@@ -34,7 +34,7 @@
 		REPORT_COUNT, 0x01, /* Report count: 1 */ \
 		INPUT, 0x02, /* Input: (Data, Var, Abs) */ \
 		PHYSICAL_MAXIMUM_2, 0x52, 0x03, /* Physical Maximum: 850 (See Apple Spec) */ \
-		LOGICAL_MAXIMUM_2, 0x10, 0x27, /* Logical Maximum: 10000 (See definition) */ \
+		LOGICAL_MAXIMUM_2, 0xe0, 0x2e, /* Logical Maximum: 12000 (See definition) */ \
 		USAGE, 0x31, /* Usage: Y */ \
 		INPUT, 0x02, /* Input: (Data, Var, Abs) */ \
 		PHYSICAL_MAXIMUM, 0x00, /* Physical Maximum: 0 */ \
@@ -66,7 +66,7 @@
 		/* Begin of 4 bytes */ \
 		/* Size is hard-coded at this moment */ \
 		USAGE_PAGE, 0x01, /* Usage Page: Generic Desktop */ \
-		LOGICAL_MAXIMUM_2, 0x80, 0x3e, /* Logical Maximum: 16000 (See defintion) */ \
+		LOGICAL_MAXIMUM_2, 0x20, 0x4e, /* Logical Maximum: 20000 (See defintion) */ \
 		REPORT_SIZE, 0x10, /* Report Size: 0x10 (2 bytes) */ \
 		UNIT_EXPONENT, 0x0e, /* Unit exponent: -2 */ \
 		UNIT, 0x11, /* Unit: SI Length (cm) */ \
@@ -75,7 +75,7 @@
 		REPORT_COUNT, 0x01, /* Report count: 1 */ \
 		INPUT, 0x02, /* Input: (Data, Var, Abs) */ \
 		PHYSICAL_MAXIMUM_2, 0x52, 0x03, /* Physical Maximum: 750 (See Apple Spec) */ \
-		LOGICAL_MAXIMUM_2, 0x10, 0x27, /* Logical Maximum: 10000 (See definition) */ \
+		LOGICAL_MAXIMUM_2, 0xe0, 0x2e, /* Logical Maximum: 12000 (See definition) */ \
 		USAGE, 0x31, /* Usage: Y */ \
 		INPUT, 0x02, /* Input: (Data, Var, Abs) */ \
 		/* End of 4 bytes */ \