diff --git a/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java b/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java
index fa41b5d81..b2856fbae 100644
--- a/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java
+++ b/SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java
@@ -45,6 +45,9 @@ public class ControllerHandler implements ControllerListener {
 	public static ControllerType lastUsedType = ControllerType.OTHER;
 	public static boolean controllerActive = false;
 
+	//sufficiently large number so that it'll never collide with touch pointers (which start at 0)
+	public static final int CONTROLLER_POINTER_ID = 1000;
+
 	private static void setControllerType(Controller controller){
 		if (controller.getName().contains("Xbox")){
 			lastUsedType = ControllerType.XBOX;
@@ -179,6 +182,9 @@ public class ControllerHandler implements ControllerListener {
 		}
 	}
 
+	//we add 1000 to make the DPAD keys distinct from Keys.UP, Keys.DOWN, etc..
+	public static int DPAD_KEY_OFFSET = 1000;
+
 	//converts controller button codes to keyEvent codes
 	public static int buttonToKey(Controller controller, int btnCode){
 		ControllerMapping mapping = controller.getMapping();
@@ -195,11 +201,10 @@ public class ControllerHandler implements ControllerListener {
 		if (btnCode == mapping.buttonR1)        return Input.Keys.BUTTON_R1;
 		if (btnCode == mapping.buttonR2)        return Input.Keys.BUTTON_R2;
 
-		//we add 1000 here to make these keys distinct from Keys.UP, Keys.DOWN, etc..
-		if (btnCode == mapping.buttonDpadUp)    return Input.Keys.DPAD_UP       + 1000;
-		if (btnCode == mapping.buttonDpadDown)  return Input.Keys.DPAD_DOWN     + 1000;
-		if (btnCode == mapping.buttonDpadLeft)  return Input.Keys.DPAD_LEFT     + 1000;
-		if (btnCode == mapping.buttonDpadRight) return Input.Keys.DPAD_RIGHT    + 1000;
+		if (btnCode == mapping.buttonDpadUp)    return Input.Keys.DPAD_UP       + DPAD_KEY_OFFSET;
+		if (btnCode == mapping.buttonDpadDown)  return Input.Keys.DPAD_DOWN     + DPAD_KEY_OFFSET;
+		if (btnCode == mapping.buttonDpadLeft)  return Input.Keys.DPAD_LEFT     + DPAD_KEY_OFFSET;
+		if (btnCode == mapping.buttonDpadRight) return Input.Keys.DPAD_RIGHT    + DPAD_KEY_OFFSET;
 
 		if (btnCode == mapping.buttonLeftStick) return Input.Keys.BUTTON_THUMBL;
 		if (btnCode == mapping.buttonRightStick)return Input.Keys.BUTTON_THUMBR;
@@ -208,11 +213,13 @@ public class ControllerHandler implements ControllerListener {
 	}
 
 	public static boolean icControllerKey(int keyCode){
-		if (keyCode >= Input.Keys.BUTTON_A && keyCode <= Input.Keys.BUTTON_MODE){
+		if (keyCode >= Input.Keys.BUTTON_A
+				&& keyCode <= Input.Keys.BUTTON_MODE){
 			return true;
 		}
 
-		if (keyCode >= Input.Keys.DPAD_UP+1000 && keyCode <= Input.Keys.DPAD_RIGHT+1000){
+		if (keyCode >= Input.Keys.DPAD_UP+DPAD_KEY_OFFSET
+				&& keyCode <= Input.Keys.DPAD_RIGHT+DPAD_KEY_OFFSET){
 			return true;
 		}
 
@@ -242,13 +249,13 @@ public class ControllerHandler implements ControllerListener {
 			}
 		}
 
-		if (keyCode == Input.Keys.DPAD_UP + 1000){
+		if (keyCode == Input.Keys.DPAD_UP + DPAD_KEY_OFFSET){
 			return Input.Keys.toString(Input.Keys.DPAD_UP);
-		} else if (keyCode == Input.Keys.DPAD_DOWN + 1000){
+		} else if (keyCode == Input.Keys.DPAD_DOWN + DPAD_KEY_OFFSET){
 			return Input.Keys.toString(Input.Keys.DPAD_DOWN);
-		} else if (keyCode == Input.Keys.DPAD_LEFT + 1000){
+		} else if (keyCode == Input.Keys.DPAD_LEFT + DPAD_KEY_OFFSET){
 			return Input.Keys.toString(Input.Keys.DPAD_LEFT);
-		} else if (keyCode == Input.Keys.DPAD_RIGHT + 1000){
+		} else if (keyCode == Input.Keys.DPAD_RIGHT + DPAD_KEY_OFFSET){
 			return Input.Keys.toString(Input.Keys.DPAD_RIGHT);
 		}
 
diff --git a/SPD-classes/src/main/java/com/watabou/input/InputHandler.java b/SPD-classes/src/main/java/com/watabou/input/InputHandler.java
index e20bd4e03..4d74b195a 100644
--- a/SPD-classes/src/main/java/com/watabou/input/InputHandler.java
+++ b/SPD-classes/src/main/java/com/watabou/input/InputHandler.java
@@ -79,18 +79,18 @@ public class InputHandler extends InputAdapter {
 		multiplexer.removeProcessor(processor);
 	}
 
-	public void emulateTouch(int button, boolean down){
+	public void emulateTouch(int id, int button, boolean down){
 		PointF hoverPos = PointerEvent.currentHoverPos();
 		if (down){
-			multiplexer.touchDown((int)hoverPos.x, (int)hoverPos.y, 10+button, button);
+			multiplexer.touchDown((int)hoverPos.x, (int)hoverPos.y, id, button);
 		} else {
-			multiplexer.touchUp((int)hoverPos.x, (int)hoverPos.y, 10+button, button);
+			multiplexer.touchUp((int)hoverPos.x, (int)hoverPos.y, id, button);
 		}
 	}
 
-	public void emulateDrag(int button){
+	public void emulateDrag(int id){
 		PointF hoverPos = PointerEvent.currentHoverPos();
-		multiplexer.touchDragged((int)hoverPos.x, (int)hoverPos.y, 10+button);
+		multiplexer.touchDragged((int)hoverPos.x, (int)hoverPos.y, id);
 	}
 	
 	public void processAllEvents(){
@@ -105,7 +105,7 @@ public class InputHandler extends InputAdapter {
 	
 	@Override
 	public synchronized boolean touchDown(int screenX, int screenY, int pointer, int button) {
-		if (pointer < 10) {
+		if (pointer != ControllerHandler.CONTROLLER_POINTER_ID) {
 			ControllerHandler.setControllerPointer(false);
 			ControllerHandler.controllerActive = false;
 		}
diff --git a/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java b/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java
index 3af2407fa..2ffc1ccba 100644
--- a/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java
+++ b/SPD-classes/src/main/java/com/watabou/input/KeyEvent.java
@@ -64,13 +64,13 @@ public class KeyEvent {
 	public static synchronized void processKeyEvents(){
 		for (KeyEvent k : keyEvents){
 			if (KeyBindings.getActionForKey(k) == GameAction.LEFT_CLICK){
-				Game.inputHandler.emulateTouch(PointerEvent.LEFT, k.pressed);
+				Game.inputHandler.emulateTouch(ControllerHandler.CONTROLLER_POINTER_ID, PointerEvent.LEFT, k.pressed);
 				if (KeyBindings.bindingKey) keySignal.dispatch(k);
 			} else if (KeyBindings.getActionForKey(k) == GameAction.RIGHT_CLICK){
-				Game.inputHandler.emulateTouch(PointerEvent.RIGHT, k.pressed);
+				Game.inputHandler.emulateTouch(ControllerHandler.CONTROLLER_POINTER_ID, PointerEvent.RIGHT, k.pressed);
 				if (KeyBindings.bindingKey) keySignal.dispatch(k);
 			} else if (KeyBindings.getActionForKey(k) == GameAction.MIDDLE_CLICK){
-				Game.inputHandler.emulateTouch(PointerEvent.MIDDLE, k.pressed);
+				Game.inputHandler.emulateTouch(ControllerHandler.CONTROLLER_POINTER_ID, PointerEvent.MIDDLE, k.pressed);
 				if (KeyBindings.bindingKey) keySignal.dispatch(k);
 			} else {
 				keySignal.dispatch(k);
diff --git a/SPD-classes/src/main/java/com/watabou/input/PointerEvent.java b/SPD-classes/src/main/java/com/watabou/input/PointerEvent.java
index ccf58ba55..bc438d48f 100644
--- a/SPD-classes/src/main/java/com/watabou/input/PointerEvent.java
+++ b/SPD-classes/src/main/java/com/watabou/input/PointerEvent.java
@@ -175,12 +175,8 @@ public class PointerEvent {
 		pointerEvents.clear();
 
 		//add drag events for any emulated presses
-		if (hovered){
-			for (int i = 10+LEFT; i <= 10+FORWARD; i++){
-				if (activePointers.containsKey(i)){
-					Game.inputHandler.emulateDrag(i-10);
-				}
-			}
+		if (hovered && activePointers.containsKey(ControllerHandler.CONTROLLER_POINTER_ID)){
+			Game.inputHandler.emulateDrag(ControllerHandler.CONTROLLER_POINTER_ID);
 		}
 	}