diff --git a/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java b/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java
index dd4c8b876b5143b8eac125294b4bb69efaa6a65f..e1844dd1de9eb798c79f3dc4b498aa8b34c9ec0f 100644
--- a/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java
+++ b/src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java
@@ -28,10 +28,11 @@ public class DigitalInputBlock extends TranslatorBlock
 		
 		if(translatorBlock instanceof NumberBlock || translatorBlock instanceof VariableNumberBlock){
 			//translator.addInputPin(number.trim());
-			translator.addSetupCommand("pinMode("+number.trim()+", INPUT);");
+			if(!translator.containsSetupCommand("pinMode("+number.trim()+", INPUT_PULLUP);")) {
+				translator.addSetupCommand("pinMode("+number.trim()+", INPUT);");
+			}	
 		}
-		
-		
+			
 		String ret = "digitalRead(";
 		ret = ret + number;
 		ret = ret + ")";
@@ -41,5 +42,4 @@ public class DigitalInputBlock extends TranslatorBlock
 		TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
 		return new CodeDigitalRead(new SimTypeInt(translatorBlock.toSim()));
 	}
-
 }
diff --git a/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java b/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java
index 2b630b313eea93351a52b7abe50872d42d9d9b3c..054ddae617d57f08fe59f954d93ba5f8034bbf87 100644
--- a/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java
+++ b/src/main/java/com/ardublock/translator/block/input/DigitalInputPullBlock.java
@@ -25,10 +25,7 @@ public class DigitalInputPullBlock extends TranslatorBlock
 			translator.addSetupCommand("pinMode("+number.trim()+", INPUT_PULLUP);");
 		}
 		
-		String ret = "digitalRead(";
-		ret = ret + translatorBlock.toCode().replaceAll("\\s*_.new\\b\\s*", "");
-		ret = ret + ");\n";
-		return codePrefix + ret + codeSuffix;
+		return "";
 	} 
 
 }