diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index 128311c1ac45397a0d43d7c998beec463c768630..04458ad88e64a09444911de1e0e037a0e351ade7 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -59,7 +59,8 @@ ObservationControl::ObservationControl(const string&	cntlrName) :
 	itsChildPort		(0),
 	itsParentControl	(0),
 	itsParentPort		(0),
-	itsTimerPort		(0)
+	itsTimerPort		(0),
+	itsState			(CTState::NOSTATE)
 {
 	LOG_TRACE_OBJ_STR (cntlrName << " construction");
 
@@ -88,6 +89,8 @@ ObservationControl::ObservationControl(const string&	cntlrName) :
 
 	registerProtocol (CONTROLLER_PROTOCOL, CONTROLLER_PROTOCOL_signalnames);
 	registerProtocol (PA_PROTOCOL, 		   PA_PROTOCOL_signalnames);
+
+	setState(CTState::CREATED);
 }
 
 
@@ -106,6 +109,20 @@ ObservationControl::~ObservationControl()
 	// ...
 }
 
+//
+// setState(CTstateNr)
+//
+void	ObservationControl::setState(CTState::CTstateNr		newState)
+{
+	itsState = newState;
+
+	if (itsPropertySet) {
+		CTState		cts;
+		itsPropertySet->setValue(string(PVSSNAME_FSM_STATE),
+								 GCFPVString(cts.name(newState)));
+	}
+}
+
 
 //
 // handlePropertySetAnswer(answer)
@@ -167,6 +184,17 @@ void ObservationControl::handlePropertySetAnswer(GCFEvent& answer)
 		break;
 	}  
 
+//	case F_SUBSCRIBED:
+//	case F_UNSUBSCRIBED:
+//	case F_PS_CONFIGURED:
+//	case F_EXTPS_LOADED:
+//	case F_EXTPS_UNLOADED:
+//	case F_MYPS_ENABLED:
+//	case F_MYPS_DISABLED:
+//	case F_VGETRESP:
+//	case F_VCHANGEMSG:
+//	case F_SERVER_GONE:
+
 	default:
 		break;
 	}  
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
index 6077c0f8ce043eb4de30d9bd94f45188959c8feb..303283a3170509535110c6b0c959bb06bbc8bb0b 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
@@ -88,6 +88,7 @@ private:
 	ObservationControl(const ObservationControl&);
    	ObservationControl& operator=(const ObservationControl&);
 
+	void setState(CTState::CTstateNr	newState);
    	void _connectedHandler(GCFPortInterface& port);
    	void _disconnectedHandler(GCFPortInterface& port);
    	boost::shared_ptr<ACC::APS::ParameterSet> 
@@ -121,6 +122,8 @@ private:
 
 	GCFTimerPort*			itsTimerPort;
 
+	CTState::CTstateNr		itsState;
+
 	// ParameterSet variables
 	string					itsTreePrefix;
 	uint32					itsInstanceNr;