diff --git a/include/Entities/Entity.hpp b/include/Entities/Entity.hpp
index 7f0d7d8..e36b036 100644
--- a/include/Entities/Entity.hpp
+++ b/include/Entities/Entity.hpp
@@ -99,6 +99,7 @@ namespace Entities {
             std::atomic<bool> MovementWorkerStarted = false;
             std::shared_ptr<DirectCommunication::DirectCommunicationServer> MovemtServer_ = nullptr;
             void handleMovement();
+            std::string MovementPodUUID_;
            
 
             std::shared_ptr<DirectCommunication::DirectCommunicationServer> CommandCommsServer_ = nullptr;
diff --git a/include/Orders/MoveOrder.hpp b/include/Orders/MoveOrder.hpp
index 3e1294e..c011fd3 100644
--- a/include/Orders/MoveOrder.hpp
+++ b/include/Orders/MoveOrder.hpp
@@ -11,9 +11,9 @@ namespace Orders
     class MoveOrder: public Order
     {   
         public:
-            MoveOrder(const SimCore::Identifier OwnID, WHISPER::SourceType srcType);
+            MoveOrder(const SimCore::Identifier OwnID);
 
-            MoveOrder(const SimCore::Identifier OwnID,WHISPER::SourceType srcType,SimCore::Position pos,double speed = 0,double course = 0, int startTime = 0);
+            MoveOrder(const SimCore::Identifier OwnID,SimCore::Position pos,double speed = 0,double course = 0, int startTime = 0);
             
             ~MoveOrder();
 
diff --git a/include/Orders/Order.hpp b/include/Orders/Order.hpp
index 241b49d..7e96de4 100644
--- a/include/Orders/Order.hpp
+++ b/include/Orders/Order.hpp
@@ -16,13 +16,12 @@ namespace Orders
     class Order
     {
         public: 
-            Order(const SimCore::Identifier OwnID,const WHISPER::SourceType srcType, const Orders::OrderType  OrderType_);
+            Order(const SimCore::Identifier OwnID, const Orders::OrderType  OrderType_);
             
             
             const SimCore::Identifier getOrderID();
             const SimCore::Identifier getOwnID();
 
-            const WHISPER::SourceType srcType;
 
             const Orders::OrderType getOrderType();
 
diff --git a/libs/KubeControl b/libs/KubeControl
index 681338d..f1e8b3a 160000
--- a/libs/KubeControl
+++ b/libs/KubeControl
@@ -1 +1 @@
-Subproject commit 681338d945ee514755a13536fbae1156145edc12
+Subproject commit f1e8b3a0774526ab57f4b0f54070ed328b0bc713
diff --git a/libs/SimCore b/libs/SimCore
index ed14aed..b546628 160000
--- a/libs/SimCore
+++ b/libs/SimCore
@@ -1 +1 @@
-Subproject commit ed14aedf0c7930ba5717de097959de1d14d851ce
+Subproject commit b546628663b439e40e9d68e00760709433cb9744
diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index f288302..7dec980 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -45,7 +45,7 @@ namespace Entities
                  
     {
         PodController_ = std::make_unique<kubecontrol::PodController>("docs/config");
-        OwnShipTrack = std::make_shared<SimCore::SimTrack>(OwnID, OwnType, EntityKind);
+        OwnShipTrack = std::make_shared<SimCore::SimTrack>(OwnID, EnttityName, EntityKind);
         OwnShipTrack->setPosition(SimCore::Position());
 
         MovemtServer_ =  std::make_shared<DirectCommunication::DirectCommunicationServer>(__MOVEMENT_SERVER_PORT__);
@@ -70,7 +70,7 @@ namespace Entities
         OwnShipTrack->setPosition(pos);
         LOG_S(INFO)<< "POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
 
-        Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY);
+        Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
         moveorder.setPosition(pos);
         if(MovementWorkerStarted == true)
         {
@@ -81,7 +81,7 @@ namespace Entities
     void Entity::setSpeed(double val)
     {
         OwnShipTrack->Speed.setValue(val);
-        Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY);
+        Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
         moveorder.Speed.setValue(val);
         if(MovementWorkerStarted == true)
         {
@@ -92,7 +92,7 @@ namespace Entities
     void Entity::setCourse(double val)
     {
         OwnShipTrack->Course.setValue(val);
-        Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier(),WHISPER::SourceType::ENTITY);
+        Orders::MoveOrder moveorder(OwnShipTrack->getIdentifier());
         moveorder.Course.setValue(val);
         if(MovementWorkerStarted == true)
         {
@@ -144,7 +144,8 @@ namespace Entities
     {   
         if (online_ == true) {
             LOG_S(INFO)<<"__ONLINE__";
-            auto MovementPod = kubecontrol::KubePod("movmentpod-"+EntityName_,xg::newGuid().str(),"movementimage:latest");
+            MovementPodUUID_ = xg::newGuid().str();
+            auto MovementPod = kubecontrol::KubePod(MovementPodUUID_,MovementPodUUID_,"movementimage:latest");
             MovementPod.setEnvironmentVar("SERVER_IP", SimCore::UtilFunctions::getOwnIP());
             LOG_S(INFO)<< MovementPod.createYAML();
             PodController_->startPod(MovementPod);
@@ -182,13 +183,13 @@ namespace Entities
                 if (newTrack != nullptr) 
                 {
                     OwnShipTrack->setPosition(newTrack->getPosition());
-                    // LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
+                    LOG_S(INFO)<< "new POS: LAT: "<< OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LATITUDE) << " LON: " << OwnShipTrack->getPosition().getGeodesicPos()(SimCore::LONGITUDE);
                 }
             }
 
             if (MovemtServer_->countClients() == 0) 
             {
-            MovementWorkerStarted = false;
+                MovementWorkerStarted = false;
             }
     }
 
diff --git a/src/Orders/MoveOrder.cpp b/src/Orders/MoveOrder.cpp
index cf5eea5..b57e57b 100644
--- a/src/Orders/MoveOrder.cpp
+++ b/src/Orders/MoveOrder.cpp
@@ -10,8 +10,8 @@
 namespace Orders 
 {
 
-    MoveOrder::MoveOrder(const SimCore::Identifier OwnID, WHISPER::SourceType srcType):
-    Order(OwnID,srcType,Orders::MOVE_ORDER)
+    MoveOrder::MoveOrder(const SimCore::Identifier OwnID):
+    Order(OwnID,Orders::MOVE_ORDER)
     {
         Speed = SimCore::Data<double>();
         Course = SimCore::Data<double>();
@@ -20,8 +20,8 @@ namespace Orders
 
     }
 
-    MoveOrder::MoveOrder(const SimCore::Identifier OwnID,WHISPER::SourceType srcType,SimCore::Position pos,double speed,double course , int startTime ):
-    Order(OwnID, srcType,Orders::MOVE_ORDER)
+    MoveOrder::MoveOrder(const SimCore::Identifier OwnID,SimCore::Position pos,double speed,double course , int startTime ):
+    Order(OwnID, Orders::MOVE_ORDER)
     {
         Speed = SimCore::Data<double>();
         Course = SimCore::Data<double>();
@@ -50,7 +50,7 @@ namespace Orders
 
     WHISPER::Message MoveOrder::buildMessage()
     {   
-        WHISPER::Message msg = WHISPER::Message(getOwnID().getUUID(), WHISPER::MsgTopics::COMMANDS  , WHISPER::MsgType::COMMAND , srcType);
+        WHISPER::Message msg = WHISPER::Message(getOwnID().getUUID(), WHISPER::MsgTopics::COMMANDS  , WHISPER::MsgType::COMMAND);
 
         messages::entity::order::MoveOrder MoveOrder = messages::entity::order::MoveOrder();
 
@@ -117,7 +117,7 @@ namespace Orders
                
                 SimCore::Identifier OrderID(order.orderid());
                 
-                auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID,(WHISPER::SourceType)msg.sourceType_);
+                auto MoveOrderObj = std::make_unique<MoveOrder>(OrderID);
 
                 if (moveOrder.has_geocentricposition()) MoveOrderObj->setPosition(SimCore::Position(moveOrder.geocentricposition().x(),moveOrder.geocentricposition().y(),moveOrder.geocentricposition().z()));
 
diff --git a/src/Orders/Order.cpp b/src/Orders/Order.cpp
index c4b4d22..661994d 100644
--- a/src/Orders/Order.cpp
+++ b/src/Orders/Order.cpp
@@ -5,10 +5,9 @@
 
 namespace Orders 
 {
-    Order::Order(const SimCore::Identifier OwnID,const WHISPER::SourceType srcType, const Orders::OrderType  OrderType_):
+    Order::Order(const SimCore::Identifier OwnID,const Orders::OrderType  OrderType_):
     orderID_(SimCore::Identifier()),
     OwnID_(OwnID),
-    srcType(srcType),
     OrderType_(OrderType_)
     {