diff --git a/AF-Demo/src/af/instatnce/AFInstance.java b/AF-Demo/src/af/instatnce/AFInstance.java
index 7930fe7..7f47ccd 100644
--- a/AF-Demo/src/af/instatnce/AFInstance.java
+++ b/AF-Demo/src/af/instatnce/AFInstance.java
@@ -1,6 +1,7 @@
 package af.instatnce;
 
 import java.util.ArrayList;
+import java.util.Date;
 
 import ec02.af.data.EquinoxRawData;
 
@@ -10,7 +11,14 @@ public class AFInstance {
 	private String invoke = "";
 	private ArrayList<EquinoxRawData> timeout = null;
 	private String state ="";
+	private Date time = null;
 
+	public Date getTime() {
+		return time;
+	}
+	public void setTime(Date time) {
+		this.time = time;
+	}
 	public String getState() {
 		return state;
 	}
diff --git a/AF-Demo/src/af/state/StateIdle.java b/AF-Demo/src/af/state/StateIdle.java
index d183587..8104735 100644
--- a/AF-Demo/src/af/state/StateIdle.java
+++ b/AF-Demo/src/af/state/StateIdle.java
@@ -1,26 +1,22 @@
 package af.state;
 
 import java.util.ArrayList;
+import java.util.Date;
 
-import af.instatnce.E01Instance;
 import af.instatnce.EC02Instance;
 import af.instatnce.EQXRawInstance;
-import af.interfaces.AFEvent;
 import af.interfaces.AFState;
 import af.interfaces.EQXMsg;
 import af.message.EC02Builder;
-
 import ec02.af.abstracts.AbstractAF;
 import ec02.af.data.EquinoxRawData;
 import ec02.af.interfaces.IAFState;
-import ec02.af.utils.AlarmCategory;
-import ec02.af.utils.AlarmSeverity;
-import ec02.af.utils.AlarmType;
 
 public class StateIdle  implements IAFState {
 	private String eqxState = null;
 	private EC02Builder ec02Builder = new EC02Builder();
 	private ArrayList<EquinoxRawData> eqxRawDataList = new ArrayList<EquinoxRawData>();
+	private Date time = null;
 
 	@Override
 	public String doAction(AbstractAF abstractAF, Object instance, ArrayList<EquinoxRawData> eqxRawDataList) {
@@ -72,11 +68,12 @@ public class StateIdle  implements IAFState {
 			}	
 			
 			this.eqxState = AFState.W_ARes;
-			
+			time = new Date();
 		}
 		ec02Ins.setEqxRawDataList(this.eqxRawDataList);
 		ec02Ins.getAFInstance().setTimeout(this.eqxRawDataList);
 		ec02Ins.getAFInstance().setState(eqxState);
+		ec02Ins.getAFInstance().setTime(time);
 		return this.eqxState;
 	}
 
diff --git a/AF-Demo/src/af/state/StateWaitA.java b/AF-Demo/src/af/state/StateWaitA.java
index 9db07f4..329d61e 100644
--- a/AF-Demo/src/af/state/StateWaitA.java
+++ b/AF-Demo/src/af/state/StateWaitA.java
@@ -1,14 +1,10 @@
 package af.state;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
 
-import th.co.ais.equinox.utils.StringExtract;
 import af.instatnce.EC02Instance;
-import af.instatnce.EQXRawInstance;
-import af.interfaces.AFEvent;
 import af.interfaces.AFState;
-import af.interfaces.EQXMsg;
 import af.message.EC02Builder;
 import ec02.af.abstracts.AbstractAF;
 import ec02.af.data.EquinoxRawData;
@@ -19,14 +15,18 @@ public class StateWaitA implements IAFState {
 	private String eqxState = null;
 	private EC02Builder ec02Builder = new EC02Builder();
 	private ArrayList<EquinoxRawData> eqxRawDataList = new ArrayList<EquinoxRawData>();
+	private Date date = null;
 
 	@Override
 	public String doAction(AbstractAF abstractAF, Object instance, ArrayList<EquinoxRawData> eqxRawDataList) {
 		EC02Instance ec02Ins = (EC02Instance) instance;
-		AppLog.d("######"+eqxRawDataList.size());
 		if(ec02Ins.getEquinoxProperties().getDiag().equals("Timeout")){
 			this.eqxRawDataList=ec02Ins.getAFInstance().getTimeout();
 			eqxState = ec02Ins.getAFInstance().getState();
+			date = new Date();
+			long seconds = (date.getTime()-ec02Ins.getAFInstance().getTime().getTime())/1000;
+			ec02Ins.getAFInstance().setTime(date);
+			this.eqxState = AFState.W_ARes;
 			
 		}
 		else{
@@ -57,10 +57,14 @@ public class StateWaitA implements IAFState {
 				}
 			}
 			if(ec02Ins.getAFInstance().getTimeout().size()!=0){
-				this.eqxRawDataList=ec02Ins.getAFInstance().getTimeout();
+				AppLog.d("HAVE DATA");
+				date = new Date();
+				long seconds = (date.getTime()-ec02Ins.getAFInstance().getTime().getTime())/1000;
 				this.eqxState = AFState.W_CRes;
 			}
 			else{
+				date = new Date();
+				long seconds = (date.getTime()-ec02Ins.getAFInstance().getTime().getTime())/1000;
 				this.eqxState = AFState.W_CRes;
 			}
 			//ArrayList<EQXRawInstance> eqxRawList = new ArrayList<EQXRawInstance>();
@@ -76,9 +80,6 @@ public class StateWaitA implements IAFState {
 			}*/
 			}
 		}
-		
-		ec02Ins.setEqxRawDataList(this.eqxRawDataList);
-		ec02Ins.getAFInstance().setTimeout(this.eqxRawDataList);
 		ec02Ins.getAFInstance().setState(eqxState);
 		return this.eqxState;
 	}
diff --git a/AF-Demo/src/af/state/StateWaitC.java b/AF-Demo/src/af/state/StateWaitC.java
index e2af3e7..5bf6713 100644
--- a/AF-Demo/src/af/state/StateWaitC.java
+++ b/AF-Demo/src/af/state/StateWaitC.java
@@ -1,12 +1,10 @@
 package af.state;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
 
-import th.co.ais.equinox.utils.StringExtract;
 import af.instatnce.EC02Instance;
 import af.instatnce.EQXRawInstance;
-import af.interfaces.AFEvent;
 import af.interfaces.AFState;
 import af.interfaces.EQXMsg;
 import af.message.EC02Builder;
@@ -14,11 +12,13 @@ import ec02.af.abstracts.AbstractAF;
 import ec02.af.data.EquinoxRawData;
 import ec02.af.interfaces.IAFState;
 import ec02.utils.AppLog;
+import sun.net.www.ApplicationLaunchException;
 
 public class StateWaitC implements IAFState {
 	private String eqxState = null;
 	private EC02Builder ec02Builder = new EC02Builder();
 	private ArrayList<EquinoxRawData> eqxRawDataList = new ArrayList<EquinoxRawData>();
+	private Date time = null;
 
 	@Override
 	public String doAction(AbstractAF abstractAF, Object instance, ArrayList<EquinoxRawData> eqxRawDataList) {
@@ -26,7 +26,8 @@ public class StateWaitC implements IAFState {
 		if(ec02Ins.getEquinoxProperties().getDiag().equals("Timeout")){
 			this.eqxRawDataList=ec02Ins.getAFInstance().getTimeout();
 			eqxState = ec02Ins.getAFInstance().getState();
-			
+			time = new Date();
+			long seconds = (time.getTime()-ec02Ins.getAFInstance().getTime().getTime())/1000;
 		}
 		else{
 		for (EquinoxRawData eqxRawData : eqxRawDataList) {
@@ -55,6 +56,8 @@ public class StateWaitC implements IAFState {
 			if(ec02Ins.getAFInstance().getTimeout().size()!=0){
 				this.eqxRawDataList=ec02Ins.getAFInstance().getTimeout();
 				eqxState = ec02Ins.getAFInstance().getState();
+				time = new Date();
+				long seconds = (time.getTime()-ec02Ins.getAFInstance().getTime().getTime())/1000;
 			}
 			else{
 			EQXRawInstance eqxRaw = new EQXRawInstance();
--
libgit2 0.21.2