diff --git a/src/display.h b/src/display.h
index 7fcbb17..ce35a96 100644
--- a/src/display.h
+++ b/src/display.h
@@ -9,6 +9,8 @@
 #define DISPLAY_H_
 
 
+const uint32_t DISPLAY_CYCLE = 10;
+
 void displayInit(void *handleArg);
 void displayExec(void *handleArg);
 void displaySetValue(uint8_t v);
diff --git a/src/main.c b/src/main.c
index a97d572..f1ebd51 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,6 @@
 #include "display.h"
 #include "displayMuxer.h"
 #include "PontCoopScheduler.h"
-// #include "testTask.h"
 #include "measure.h"
 
 
@@ -38,20 +37,12 @@ int main() {
 	displayInit(NULL);
 	__disable_interrupt();
 
-//	tTestTaskHandle testTaskHandle1;
-//	testTaskInit(&testTaskHandle1, TESTPIN1);
-//
-//	tTestTaskHandle testTaskHandle2;
-//	testTaskInit(&testTaskHandle2, TESTPIN2);
-
 	measureInit(NULL);
 //	displayMuxerInit(NULL);
 
 
-	schAdd(displayExec, NULL, 0, 10);
-//	schAdd(testTaskExec, &testTaskHandle1, 0, 20);
-//	schAdd(testTaskExec, &testTaskHandle2, 2, 20);
-	schAdd(measureStartConversion, NULL, 0, 1000);
+	schAdd(displayExec, NULL, 0, DISPLAY_CYCLE);
+	schAdd(measureStartConversion, NULL, 0, MEASURE_CYCLE);
 //	schAdd(displayMuxerExec, NULL, 0, 500);
 
 	__enable_interrupt();
diff --git a/src/measure.c b/src/measure.c
index 3427b6e..9087aaf 100644
--- a/src/measure.c
+++ b/src/measure.c
@@ -36,11 +36,13 @@ void measureCollectAndProcessConversion(void *handleArg);
 void measureStartConversion(void *handleArg) {
 	//gpioSetPin(TESTPIN1, HIGH);
 	ADC10CTL0 |= ENC | ADC10SC;
-	schAdd(measureCollectAndProcessConversion, NULL, 10, 0);
+	schAdd(measureCollectAndProcessConversion, NULL, MEASURE_FETCH_RESULT_DELAY, 0);
 	//gpioSetPin(TESTPIN1, LOW);
 }
 
 void measureCollectAndProcessConversion(void *handleArg) {
+  
+          
 	//gpioSetPin(TESTPIN2, HIGH);
 	uint16_t n = 0xffff;
 	if ((ADC10CTL0 & ADC10IFG) != 0) {
diff --git a/src/measure.h b/src/measure.h
index 74f3b43..cf69d0c 100644
--- a/src/measure.h
+++ b/src/measure.h
@@ -12,6 +12,10 @@
 
 
 
+const uint32_t MEASURE_CYCLE = 20;
+const uint32_t MEASURE_FETCH_RESULT_DELAY = 5;
+const uint8_t AVERAGING_COUNT = 100;
+
 
 void measureInit(void *handleArg);
 void measureStartConversion(void *handleArg);