     }
 }
 
-void HueForce::initLightWake(int history){
-    Acceleration *initAxis;
-
-    for (int i = 0; i < history; ++i){
-        initAxis = new Acceleration;
-        initAxis->x = 1;
-        initAxis->y = 1;
-        initAxis->z = 1;
-        
-        lightWake.push(initAxis);
-    }
-}
-
 void HueForce::setAxis(){
     sensors_event_t event; 
     accel.getEvent(&event);
     
-    axis->x = int(abs(event.acceleration.x / SENSORS_GRAVITY_STANDARD));
-    axis->y = int(abs(event.acceleration.y / SENSORS_GRAVITY_STANDARD));
-    axis->z = int(abs(event.acceleration.z / SENSORS_GRAVITY_STANDARD));
+    axis->x = int(abs(event.acceleration.x * modifier / SENSORS_GRAVITY_STANDARD));
+    axis->y = int(abs(event.acceleration.y * modifier / SENSORS_GRAVITY_STANDARD));
+    axis->z = int(abs(event.acceleration.z * modifier / SENSORS_GRAVITY_STANDARD));
    
-    //mergeResults();
+    mergeResults();
 }
 
 void HueForce::mergeResults(){

    pixels.show();
    
    setLimit(force);
    initLightWake(5);
    
}

HueForce::~HueForce(){


void setup() {
  Serial.begin(9600);
  if (DEBUG)
      while (!Serial) ;
  hueForce = new HueForce(G_FORCE, LIGHT_COUNT, LIGHT_PIN);
}


void loop() {
    hueForce->start();
    if (DEBUG)
        hueForce->displayStatus(hueForce->axis);
    delay(DELAY_VALUE);
}

