 
 */
 void loop() {
-  // read the state of the pushbutton value:
+  // Read the state of button 1 and if it hasn't been detected as pushed, trigger one Serial.print for Button^1
   buttonState = digitalRead(buttonPin);
-  buttonState2 = digitalRead(buttonPin2);
-
+  
   if (buttonState == HIGH) {
     if(buttonDown == 0){
       buttonDown = 1;
       Serial.print("Button^1\n");
-      //delay(3);
+      digitalWrite(ledPin, HIGH);
     }
   } else {
     if(buttonDown == 1){
       buttonDown = 0;
+      digitalWrite(ledPin, LOW);
     }
   }
 
 
-  //button 2 pushed
+  // Read the state of button 2 and if it hasn't been detected as pushed, trigger one Serial.print for Button^2
+  buttonState2 = digitalRead(buttonPin2);
+  
   if (buttonState2 == HIGH) {
     if(buttonDown2 == 0){
       buttonDown2 = 1;
-      Serial.print("Button^2\n");      
-      //delay(3);
+      Serial.print("Button^2\n");
+      digitalWrite(ledPin2, HIGH); 
     }
   } else {
     if(buttonDown2 == 1){
       buttonDown2 = 0;
+      digitalWrite(ledPin2, LOW);
     }
-  }
-
-  serialEvent(); //call the function
-  // print the string when a newline arrives:
-  if (stringComplete) {
-    if(inputString == "green") {
-      digitalWrite(ledPin, HIGH);
-      delay(50);
-      digitalWrite(ledPin, LOW);
-      delay(50);
-      digitalWrite(ledPin, HIGH);
-      delay(50);
-      digitalWrite(ledPin, LOW);
-      delay(50);
-      digitalWrite(ledPin, HIGH);
-      delay(50);
-      digitalWrite(ledPin, LOW);
-    }
-    // clear the string:
-    inputString = "";
-    stringComplete = false;
   }
 }
 
-
-/*
-  SerialEvent occurs whenever a new data comes in the
- hardware serial RX.  This routine is run between each
- time loop() runs, so using delay inside loop can delay
- response.  Multiple bytes of data may be available.
- */
-void serialEvent() {
-  while (Serial.available()) {
-    // get the new byte:
-    char inChar = (char)Serial.read();
-    // add it to the inputString:
-    inputString += inChar;
-    // if the incoming character is a newline, set a flag
-    // so the main loop can do something about it:
-    if (inChar == '\r') {
-      stringComplete = true;
-    }
-  }
-}


  Serial.begin(9600);

  // reserve 200 bytes for the inputString:
  inputString.reserve(200);
}
/*


/*
  Push a button and send a string over serial.

  Buttons are on pins 2 and 4.
  LEDS are on pin 9 and pin 10.
*/


// set variables for button 1
const int buttonPin = 2;
const int ledPin =  9;
int buttonState = 0;
int buttonDown = 0;

//set variables for button 2
const int buttonPin2 = 4;
const int ledPin2 = 10;
int buttonState2 = 0;
int buttonDown2 = 0;


void setup() {
  // initialize the LED pin as an output:
