diff --git a/AF-Demo/src/af/state/StateIdle.java b/AF-Demo/src/af/state/StateIdle.java
index 6f95d3e..374c5c8 100644
--- a/AF-Demo/src/af/state/StateIdle.java
+++ b/AF-Demo/src/af/state/StateIdle.java
@@ -24,6 +24,9 @@ public class StateIdle  implements IAFState {
 		EC02Instance ec02Ins = (EC02Instance) instance;
 		if(ec02Ins.getAFInstance().getInvoke()!=null){
 			for(EquinoxRawData eqxRawData : eqxRawDataList){
+				this.ec02Builder.setEquinoxRawData(eqxRawData, abstractAF, ec02Ins);
+				ec02Ins.getAFInstance().setInvoke(eqxRawData.getInvoke());
+				ec02Ins.getAFInstance().setOrig(eqxRawData.getRawDataAttribute(EQXMsg.ORIG));
 				EQXRawInstance eqxRaw = new EQXRawInstance();
 				eqxRaw.setMessage("Already in use!");
 				eqxRaw.setTo(ec02Ins.getAFInstance().getOrig());
@@ -78,7 +81,6 @@ public class StateIdle  implements IAFState {
 		ec02Ins.setEqxRawDataList(this.eqxRawDataList);
 		ec02Ins.getAFInstance().setTimeout(this.eqxRawDataList);
 		ec02Ins.getAFInstance().setState(eqxState);
-		ec02Ins.getAFInstance().setTime(date);
 		return this.eqxState;
 	}
 
diff --git a/AF-Demo/src/af/state/StateWaitA.java b/AF-Demo/src/af/state/StateWaitA.java
index 2b70072..4e5eb1c 100644
--- a/AF-Demo/src/af/state/StateWaitA.java
+++ b/AF-Demo/src/af/state/StateWaitA.java
@@ -22,14 +22,9 @@ public class StateWaitA implements IAFState {
 	@Override
 	public String doAction(AbstractAF abstractAF, Object instance, ArrayList<EquinoxRawData> eqxRawDataList) {
 		EC02Instance ec02Ins = (EC02Instance) instance;
-		AppLog.d("######"+ec02Ins.getAFInstance().getTime());
 		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;
-			 AppLog.d("Defferent Time: "+seconds);
-			
 		}
 		else{
 		for (EquinoxRawData eqxRawData : eqxRawDataList) {
@@ -53,21 +48,14 @@ public class StateWaitA implements IAFState {
 
 			ArrayList<EQXRawInstance> eqxRawList = new ArrayList<EQXRawInstance>();
 			
-			EQXRawInstance eqxRaw = new EQXRawInstance();
-			eqxRaw.setMessage("C Req.");
-			eqxRaw.setTo(abstractAF.getUtils().getHmWarmConfig().get("Resource-Name-C").get(0));
-			eqxRaw.setCtype(EQXMsg.TEXTXML);
-			eqxRawList.add(eqxRaw);
-			ArrayList<EquinoxRawData> rawList = this.ec02Builder.getBRequest(eqxRawList);
-			for (int i = 0; i < rawList.size(); i++) {
-				this.eqxRawDataList.add(rawList.get(i));
-			}
-			date = new Date();
-			
-			long seconds = (date.getTime()-ec02Ins.getAFInstance().getTime().getTime())/1000;
-			AppLog.d("Defferent Time: "+seconds);
-			this.eqxState = AFState.W_CRes;
 
+			EQXRawInstance eqxRaw = new EQXRawInstance();
+			eqxRaw.setMessage("A Res.");
+			eqxRaw.setTo(ec02Ins.getAFInstance().getOrig());
+			eqxRaw.setCtype(EQXMsg.TEXTPLAIN);
+			this.eqxRawDataList.add(this.ec02Builder.getHTTPResponse(eqxRaw,ec02Ins.getAFInstance().getInvoke()));
+			this.eqxState = AFState.IDLE;
+			ec02Ins.getAFInstance().setInvoke(null);
 			}
 		}
 		
--
libgit2 0.21.2