Index: code/branches/presentation3/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/BigExplosion.cc	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/BigExplosion.cc	(revision 7153)
@@ -101,4 +101,9 @@
         this->debrisEntity3_ = new MovableEntity(this);
         this->debrisEntity4_ = new MovableEntity(this);
+        
+        this->debrisEntity1_->setSyncMode(0);
+        this->debrisEntity2_->setSyncMode(0);
+        this->debrisEntity3_->setSyncMode(0);
+        this->debrisEntity4_->setSyncMode(0);
 
         this->debris1_ = new Model(this);
@@ -106,6 +111,12 @@
         this->debris3_ = new Model(this);
         this->debris4_ = new Model(this);
+        
+        this->debris1_->setSyncMode(0);
+        this->debris2_->setSyncMode(0);
+        this->debris3_->setSyncMode(0);
+        this->debris4_->setSyncMode(0);
 
         this->explosion_ = new StaticEntity(this);
+        this->explosion_->setSyncMode(0);
 
         this->debrisSmoke1_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/smoke7", this->LOD_);
@@ -158,4 +169,5 @@
         effect->setSource("Orxonox/explosion2b");
         effect->setLifetime(4.0f);
+        effect->setSyncMode(0);
 
         ParticleSpawner* effect2 = new ParticleSpawner(this->getCreator());
@@ -163,4 +175,5 @@
         effect2->setSource("Orxonox/smoke6");
         effect2->setLifetime(4.0f);
+        effect2->setSyncMode(0);
 
         this->explosion_->attach(effect);
@@ -181,4 +194,9 @@
             MovableEntity* partEntity1 = new MovableEntity(this);
             MovableEntity* partEntity2 = new MovableEntity(this);
+            
+            part1->setSyncMode(0);
+            part2->setSyncMode(0);
+            partEntity1->setSyncMode(0);
+            partEntity2->setSyncMode(0);
 
             partEntity1->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10,100));
Index: code/branches/presentation3/src/orxonox/worldentities/BigExplosion.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/BigExplosion.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/BigExplosion.h	(revision 7153)
@@ -45,5 +45,4 @@
 
             virtual void tick(float dt);
-            void registerVariables();
 
             inline void setLOD(LODParticle::Value level)
@@ -53,4 +52,5 @@
 
         private:
+            void registerVariables();
 
             void LODchanged();
Index: code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/ControllableEntity.h	(revision 7153)
@@ -49,5 +49,4 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
-            void registerVariables();
             void setConfigValues();
 
@@ -167,4 +166,5 @@
 
         private:
+            void registerVariables();
             void setXMLController(Controller* controller);
 
Index: code/branches/presentation3/src/orxonox/worldentities/ExplosionChunk.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/ExplosionChunk.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/ExplosionChunk.h	(revision 7153)
@@ -44,5 +44,4 @@
 
             virtual void tick(float dt);
-            void registerVariables();
 
             inline void setLOD(LODParticle::Value level)
@@ -52,4 +51,5 @@
 
         private:
+            void registerVariables();
             void LODchanged();
             void checkStop();
Index: code/branches/presentation3/src/orxonox/worldentities/MobileEntity.cc
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/MobileEntity.cc	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/MobileEntity.cc	(revision 7153)
@@ -46,6 +46,4 @@
         this->angularAcceleration_ = Vector3::ZERO;
         this->angularVelocity_     = Vector3::ZERO;
-
-        this->registerVariables();
     }
 
Index: code/branches/presentation3/src/orxonox/worldentities/MovableEntity.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/MovableEntity.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/MovableEntity.h	(revision 7153)
@@ -48,5 +48,4 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            void registerVariables();
 
             using WorldEntity::setPosition;
@@ -79,4 +78,5 @@
 
         private:
+            void registerVariables();
             void clientConnected(unsigned int clientID);
             void clientDisconnected(unsigned int clientID);
Index: code/branches/presentation3/src/orxonox/worldentities/StaticEntity.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/StaticEntity.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/StaticEntity.h	(revision 7153)
@@ -42,6 +42,4 @@
             virtual ~StaticEntity();
 
-            void registerVariables();
-
             using WorldEntity::setPosition;
             using WorldEntity::setOrientation;
@@ -51,4 +49,5 @@
 
         private:
+            void registerVariables();
             bool isCollisionTypeLegal(CollisionType type) const;
 
Index: code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h	(revision 7153)
@@ -94,5 +94,4 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            void registerVariables();
 
             inline const Ogre::SceneNode* getNode() const
@@ -214,4 +213,6 @@
 
         private:
+            void registerVariables();
+            
             inline void lookAt_xmlport(const Vector3& target)
                 { this->lookAt(target); }
Index: code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc	(revision 7153)
@@ -130,5 +130,5 @@
         registerVariable(this->shieldAbsorption_, VariableDirection::ToClient);
         registerVariable(this->bReload_,          VariableDirection::ToServer);
-        registerVariable(this->aimPosition_,      Bidirectionality::ServerMaster, 0, true);
+        registerVariable(this->aimPosition_,      VariableDirection::ToServer);  // For the moment this variable gets only transfered to the server
     }
 
Index: code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.h	(revision 7153)
@@ -50,5 +50,4 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
-            void registerVariables();
 
             inline bool isAlive() const
@@ -166,4 +165,5 @@
 
         private:
+            void registerVariables();
             inline void setWeaponSystem(WeaponSystem* weaponsystem)
                 { this->weaponSystem_ = weaponsystem; }
Index: code/branches/presentation3/src/orxonox/worldentities/pawns/SpaceShip.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/pawns/SpaceShip.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/pawns/SpaceShip.h	(revision 7153)
@@ -47,5 +47,4 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
-            void registerVariables();
             void setConfigValues();
 
@@ -99,7 +98,7 @@
 
         private:
+            void registerVariables();
             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
 
-        private:
             void loadEngineTemplate();
 
Index: code/branches/presentation3/src/orxonox/worldentities/pawns/Spectator.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/pawns/Spectator.h	(revision 7127)
+++ code/branches/presentation3/src/orxonox/worldentities/pawns/Spectator.h	(revision 7153)
@@ -44,5 +44,4 @@
 
             void setConfigValues();
-            void registerVariables();
             virtual void tick(float dt);
 
@@ -63,4 +62,5 @@
 
         private:
+            void registerVariables();
             void changedGreeting();
             void changedFlareVisibility();
