diff --git a/Assets/GWConquest/Prefabs/Planets/Ahr.prefab b/Assets/GWConquest/Prefabs/Planets/Ahr.prefab
index 3af56d4..3a54408 100644
--- a/Assets/GWConquest/Prefabs/Planets/Ahr.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Ahr.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 1589588768325586260}
   - component: {fileID: 1618242416294204344}
   - component: {fileID: 1609187652349923306}
-  - component: {fileID: 1680716128568744018}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &1680716128568744018
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1586678762384993888}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &1587220222269308816
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Binnisar.prefab b/Assets/GWConquest/Prefabs/Planets/Binnisar.prefab
index ae1004b..667c1d0 100644
--- a/Assets/GWConquest/Prefabs/Planets/Binnisar.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Binnisar.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 8182865875471365777}
   - component: {fileID: 8211501793556965501}
   - component: {fileID: 8202392049746359343}
-  - component: {fileID: 8129878941000377239}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &8129878941000377239
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8180006236687734181}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &8180449907416499285
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Cervis.prefab b/Assets/GWConquest/Prefabs/Planets/Cervis.prefab
index e954167..6133c29 100644
--- a/Assets/GWConquest/Prefabs/Planets/Cervis.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Cervis.prefab
@@ -136,7 +136,6 @@ GameObject:
   - component: {fileID: 6654259507568113427}
   - component: {fileID: 6638451703744006855}
   - component: {fileID: 6629971184475388721}
-  - component: {fileID: 6702871656552785543}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -205,22 +204,3 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &6702871656552785543
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6652794129942218737}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Gysir.prefab b/Assets/GWConquest/Prefabs/Planets/Gysir.prefab
index 6220d89..09785a6 100644
--- a/Assets/GWConquest/Prefabs/Planets/Gysir.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Gysir.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 2251584881203881904}
   - component: {fileID: 2258403044103890186}
   - component: {fileID: 2268991003713988346}
-  - component: {fileID: 2197451091084126168}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &2197451091084126168
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2245678328513811038}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &2246407184258552028
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Hammon.prefab b/Assets/GWConquest/Prefabs/Planets/Hammon.prefab
index 83d65ca..f1c0d4a 100644
--- a/Assets/GWConquest/Prefabs/Planets/Hammon.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Hammon.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 5346838846915344151}
   - component: {fileID: 5353009663513537019}
   - component: {fileID: 5361650457013499305}
-  - component: {fileID: 5435714321420558865}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &5435714321420558865
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5348465357173003299}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &5348696822291826131
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Harkon.prefab b/Assets/GWConquest/Prefabs/Planets/Harkon.prefab
index 71634ec..9067535 100644
--- a/Assets/GWConquest/Prefabs/Planets/Harkon.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Harkon.prefab
@@ -57,7 +57,6 @@ GameObject:
   - component: {fileID: 6116308397041086635}
   - component: {fileID: 6096107526279234291}
   - component: {fileID: 6106631466669171533}
-  - component: {fileID: 6177412781164340721}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -126,25 +125,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &6177412781164340721
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6118914113281138557}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &6119648393556746655
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Ingrim.prefab b/Assets/GWConquest/Prefabs/Planets/Ingrim.prefab
index ae838ec..a10999f 100644
--- a/Assets/GWConquest/Prefabs/Planets/Ingrim.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Ingrim.prefab
@@ -29,9 +29,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1629548372870560815}
-  - {fileID: 1629423977265847267}
   - {fileID: 1622249883286177701}
-  - {fileID: 1629474900342745181}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -78,7 +76,7 @@ Transform:
   m_LocalScale: {x: 0.7489219, y: 0.7489211, z: 0.74892133}
   m_Children: []
   m_Father: {fileID: 1621975434726067341}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1655295598875897201
 MeshFilter:
@@ -138,7 +136,6 @@ GameObject:
   - component: {fileID: 1629548372870560815}
   - component: {fileID: 1654234420091164215}
   - component: {fileID: 1646412876781374067}
-  - component: {fileID: 1718589409948383049}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -207,180 +204,3 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &1718589409948383049
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1623947544438404563}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
---- !u!1 &1624420709540795379
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1629474900342745181}
-  - component: {fileID: 1655306678538694793}
-  - component: {fileID: 1647280005907237983}
-  m_Layer: 0
-  m_Name: Atmosphere (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &1629474900342745181
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624420709540795379}
-  m_LocalRotation: {x: -0.688878, y: 0.16365175, z: 0.5201773, w: 0.47757798}
-  m_LocalPosition: {x: 0.00012501003, y: -0.00004539295, z: 0.000029414134}
-  m_LocalScale: {x: 0.74892175, y: 0.74892104, z: 0.7489212}
-  m_Children: []
-  m_Father: {fileID: 1621975434726067341}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &1655306678538694793
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624420709540795379}
-  m_Mesh: {fileID: 4300004, guid: 4375d80065c8dc74bba60eb936227d67, type: 3}
---- !u!23 &1647280005907237983
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624420709540795379}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 6c44b4a5f131a5948a6a409200b96cd8, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!1 &1624545522471887657
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1629423977265847267}
-  - component: {fileID: 1656145093000571519}
-  - component: {fileID: 1648187105858127573}
-  m_Layer: 0
-  m_Name: Rings
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &1629423977265847267
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624545522471887657}
-  m_LocalRotation: {x: 0.5030118, y: -0.81249714, z: 0.15643944, w: 0.24970827}
-  m_LocalPosition: {x: -0.20383, y: -0.40809, z: 0.31831}
-  m_LocalScale: {x: 2.2349327, y: 2.2349327, z: 2.234933}
-  m_Children: []
-  m_Father: {fileID: 1621975434726067341}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &1656145093000571519
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624545522471887657}
-  m_Mesh: {fileID: 4300000, guid: ab4077fb2b89cdc499a57a4cb65c9a2b, type: 3}
---- !u!23 &1648187105858127573
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1624545522471887657}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 59bd7641555c0bd41839c2b027050c81, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Karth.prefab b/Assets/GWConquest/Prefabs/Planets/Karth.prefab
index 855c074..97dc282 100644
--- a/Assets/GWConquest/Prefabs/Planets/Karth.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Karth.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 4691757570317388642}
   - component: {fileID: 4716934773015783000}
   - component: {fileID: 4710261697977069322}
-  - component: {fileID: 4636894326263842816}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &4636894326263842816
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4686048233503712268}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &4686194586203081174
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Kyralos.prefab b/Assets/GWConquest/Prefabs/Planets/Kyralos.prefab
index 2fb3f5f..5003866 100644
--- a/Assets/GWConquest/Prefabs/Planets/Kyralos.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Kyralos.prefab
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 7392567858696306559}
   - component: {fileID: 7416694503640598457}
   - component: {fileID: 7406794127219201793}
-  - component: {fileID: 7478866574760105137}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &7478866574760105137
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7393696595120407909}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &7394531360708672341
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Manthra.prefab b/Assets/GWConquest/Prefabs/Planets/Manthra.prefab
index 3b49162..2fd1368 100644
--- a/Assets/GWConquest/Prefabs/Planets/Manthra.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Manthra.prefab
@@ -1,36 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &5794430014988939417
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5791872631247700225}
-  m_Layer: 0
-  m_Name: Rings
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5791872631247700225
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5794430014988939417}
-  m_LocalRotation: {x: -0.3016428, y: -0.5934468, z: -0.7443664, w: 0.05245205}
-  m_LocalPosition: {x: -0.00019138, y: -0.00060383, z: -0.0024917}
-  m_LocalScale: {x: 1.9663737, y: 1.9663738, z: 1.9663724}
-  m_Children:
-  - {fileID: 5800598135640534321}
-  m_Father: {fileID: 5800631760411530195}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5794491168422419495
 GameObject:
   m_ObjectHideFlags: 0
@@ -42,7 +11,6 @@ GameObject:
   - component: {fileID: 5800564165902611235}
   - component: {fileID: 5771126977955455263}
   - component: {fileID: 5781804027828401867}
-  - component: {fileID: 5854109601405761695}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -111,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &5854109601405761695
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5794491168422419495}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &5794642990949482251
 GameObject:
   m_ObjectHideFlags: 0
@@ -160,7 +109,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5800631760411530195}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &5771605251130473671
 MeshFilter:
@@ -209,85 +158,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!1 &5794847290310355821
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5800598135640534321}
-  - component: {fileID: 5771607456360709315}
-  - component: {fileID: 5781959936957879825}
-  m_Layer: 0
-  m_Name: Instance_0
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &5800598135640534321
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5794847290310355821}
-  m_LocalRotation: {x: -0.23767479, y: 0.40854177, z: 0.23161277, w: 0.8502705}
-  m_LocalPosition: {x: -0.0012214, y: 0.00074763, z: -0.0021496}
-  m_LocalScale: {x: 1.1636506, y: 1.1636506, z: 1.1636506}
-  m_Children: []
-  m_Father: {fileID: 5791872631247700225}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &5771607456360709315
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5794847290310355821}
-  m_Mesh: {fileID: 4300000, guid: ab4077fb2b89cdc499a57a4cb65c9a2b, type: 3}
---- !u!23 &5781959936957879825
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5794847290310355821}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 510533a6e172ca24b920e96a8366b12a, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
 --- !u!1 &5794889619070122039
 GameObject:
   m_ObjectHideFlags: 0
@@ -317,7 +187,6 @@ Transform:
   m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
   m_Children:
   - {fileID: 5800564165902611235}
-  - {fileID: 5791872631247700225}
   - {fileID: 5800416373081453301}
   m_Father: {fileID: 0}
   m_RootOrder: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Rayeon 1.prefab b/Assets/GWConquest/Prefabs/Planets/Rayeon 1.prefab
index 304d010..9b8ad88 100644
--- a/Assets/GWConquest/Prefabs/Planets/Rayeon 1.prefab	
+++ b/Assets/GWConquest/Prefabs/Planets/Rayeon 1.prefab	
@@ -136,7 +136,6 @@ GameObject:
   - component: {fileID: 943674515742193868}
   - component: {fileID: 964586774937871904}
   - component: {fileID: 955673294094908018}
-  - component: {fileID: 884071133140594122}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -205,22 +204,3 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &884071133140594122
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 942030249951271928}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Rayeon 2.prefab b/Assets/GWConquest/Prefabs/Planets/Rayeon 2.prefab
index 024c45c..b2b427f 100644
--- a/Assets/GWConquest/Prefabs/Planets/Rayeon 2.prefab	
+++ b/Assets/GWConquest/Prefabs/Planets/Rayeon 2.prefab	
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 8930518596818103092}
   - component: {fileID: 8905286820150654424}
   - component: {fileID: 8913805009542490506}
-  - component: {fileID: 8841643190999039538}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &8841643190999039538
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8927764094870521856}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &8927886708868782576
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Rayeon 3.prefab b/Assets/GWConquest/Prefabs/Planets/Rayeon 3.prefab
index b94f532..548ec03 100644
--- a/Assets/GWConquest/Prefabs/Planets/Rayeon 3.prefab	
+++ b/Assets/GWConquest/Prefabs/Planets/Rayeon 3.prefab	
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 7642260235025805069}
   - component: {fileID: 7670966373503119841}
   - component: {fileID: 7662138117682507187}
-  - component: {fileID: 7733388419873454603}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -80,25 +79,6 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &7733388419873454603
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7639400523089316921}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &7640048667028683929
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Rayeon.prefab b/Assets/GWConquest/Prefabs/Planets/Rayeon.prefab
index bc0052b..3c7d8f2 100644
--- a/Assets/GWConquest/Prefabs/Planets/Rayeon.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Rayeon.prefab
@@ -136,7 +136,6 @@ GameObject:
   - component: {fileID: 7822755816091033430}
   - component: {fileID: 7848224391080624570}
   - component: {fileID: 7839539634400288232}
-  - component: {fileID: 7911771272740686416}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -205,22 +204,3 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &7911771272740686416
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7825667952263855202}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Rythion.prefab b/Assets/GWConquest/Prefabs/Planets/Rythion.prefab
index 00be54c..ce03048 100644
--- a/Assets/GWConquest/Prefabs/Planets/Rythion.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Rythion.prefab
@@ -101,5 +101,6 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 95556654896397108, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
diff --git a/Assets/GWConquest/Prefabs/Planets/Sikhara.prefab b/Assets/GWConquest/Prefabs/Planets/Sikhara.prefab
index e77d5d6..8f38a72 100644
--- a/Assets/GWConquest/Prefabs/Planets/Sikhara.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Sikhara.prefab
@@ -77,5 +77,6 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 95081242284430428, guid: f42e8fb7bcfdc474a979ee5023161dc3, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: f42e8fb7bcfdc474a979ee5023161dc3, type: 3}
diff --git a/Assets/GWConquest/Prefabs/Planets/Taurellia.prefab b/Assets/GWConquest/Prefabs/Planets/Taurellia.prefab
index a84cc32..a3b87b2 100644
--- a/Assets/GWConquest/Prefabs/Planets/Taurellia.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Taurellia.prefab
@@ -77,5 +77,6 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 95508225412947426, guid: 2b8369136137d35498d9bcfb7b719768, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 2b8369136137d35498d9bcfb7b719768, type: 3}
diff --git a/Assets/GWConquest/Prefabs/Planets/Vaiar.prefab b/Assets/GWConquest/Prefabs/Planets/Vaiar.prefab
index c1de9ac..b7e7aa7 100644
--- a/Assets/GWConquest/Prefabs/Planets/Vaiar.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Vaiar.prefab
@@ -136,7 +136,6 @@ GameObject:
   - component: {fileID: 7926676742029964023}
   - component: {fileID: 7961038167469665307}
   - component: {fileID: 7951834441187831881}
-  - component: {fileID: 8024700428730542065}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -205,22 +204,3 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &8024700428730542065
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7929553625249583555}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Vestripee.prefab b/Assets/GWConquest/Prefabs/Planets/Vestripee.prefab
index 7155e85..2857286 100644
--- a/Assets/GWConquest/Prefabs/Planets/Vestripee.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Vestripee.prefab
@@ -136,7 +136,6 @@ GameObject:
   - component: {fileID: 1473341529966936856}
   - component: {fileID: 1444491982507421990}
   - component: {fileID: 1454622635660453222}
-  - component: {fileID: 1526436303870385698}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -205,22 +204,3 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &1526436303870385698
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1476837701567456144}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Assets/GWConquest/Prefabs/Planets/Weylan.prefab b/Assets/GWConquest/Prefabs/Planets/Weylan.prefab
index ba2d1e8..0096708 100644
--- a/Assets/GWConquest/Prefabs/Planets/Weylan.prefab
+++ b/Assets/GWConquest/Prefabs/Planets/Weylan.prefab
@@ -136,7 +136,6 @@ GameObject:
   - component: {fileID: 7524701256635853124}
   - component: {fileID: 7500577622777657256}
   - component: {fileID: 7509394866284751866}
-  - component: {fileID: 7579939801979452482}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -205,22 +204,3 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!95 &7579939801979452482
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7523054895043529328}
-  m_Enabled: 0
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: d4a824e8218271f4e95763277f4e0872, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity
index a42684f..2f18f63 100644
--- a/Assets/GWConquest/Scenes/GalaxyMap.unity
+++ b/Assets/GWConquest/Scenes/GalaxyMap.unity
@@ -23890,16 +23890,14 @@ MonoBehaviour:
     ShortName: Wythler
     FactionLogo: {fileID: 21300000, guid: 6504d938d9c4bb845a57b23e1fecfed7, type: 3}
     StartingPlanets:
-    - {fileID: 0}
-    - {fileID: 0}
+    - {fileID: 1911008116}
     IsAI: 0
   - FactionColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1}
     FactionName: Fateful Wythler Dominion
     ShortName: Wythler
     FactionLogo: {fileID: 21300000, guid: 6504d938d9c4bb845a57b23e1fecfed7, type: 3}
     StartingPlanets:
-    - {fileID: 0}
-    - {fileID: 357040276}
+    - {fileID: 905375159}
     IsAI: 0
   UnitClasses: []
   PlanetData:
diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs
index 078410a..e33f51e 100644
--- a/Assets/GWConquest/Scripts/GameManager.cs
+++ b/Assets/GWConquest/Scripts/GameManager.cs
@@ -119,12 +119,42 @@ namespace GWConquest
 
         private IEnumerator EntitiesLoadedAsync()
         {
+            yield return new WaitForSecondsRealtime(0.1f);
             yield return new WaitForFixedUpdate();
             EntitiesLoaded = true;
 
+            if(BoltNetwork.IsClient)
+            {
+                BoltLog.Info("Loading non-static planets on client...");
+                InitPlanetsClient();
+            }
+
+            Planet.SetupPlanetPathfinding();
+            BoltLog.Info("Setup planet pathfinding.");
+
+            BoltLog.Info("Entities loaded, Dismissing loading screen...");
+
             LoadingScreen.Dismiss();
         }
 
+        private void InitPlanetsClient()
+        {
+            var allPlanets = FindObjectsOfType<Planet>();
+
+            foreach(Planet planet in allPlanets)
+            {
+                if(!planet.PlanetStatic)
+                {
+                    planet.InitNonStatic();
+                }
+            }
+
+            foreach(Planet planet in allPlanets)
+            {
+                planet.FinishSetup();
+            }
+        }
+
         public static void ClearAllCaches()
         {
             _instance = null;
diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs
index 7fe3a66..9411e6b 100644
--- a/Assets/GWConquest/Scripts/Planet.cs
+++ b/Assets/GWConquest/Scripts/Planet.cs
@@ -120,8 +120,10 @@ namespace GWConquest
         {
             ConnectedPlanetsList = new EntityList(State, "ConnectedPlanets");
 
-            if(BoltNetwork.IsClient)
+            /*if(BoltNetwork.IsClient)
             {
+                BoltLog.Info("Planet attached on client, name: {0}", State.PlanetName);
+
                 State.AddCallback("SpaceZoneID", () => {
                     BoltLog.Info("Space zone id changed to {0} on client planet {1}, static: {2}", State.SpaceZoneID, State.PlanetName, PlanetStatic);
                     var zone = GetMainZone(ZoneType.Space);
@@ -144,7 +146,7 @@ namespace GWConquest
                 State.AddCallback("ConnectedPlanets", () => {
                     BoltLog.Info("Connected planets changed to {0} on client planet{1}, static: {2}", ConnectedPlanetsList, State.PlanetName, PlanetStatic);
                 });
-            }
+            }*/
 
             if(PlanetStatic)
             {
@@ -184,6 +186,13 @@ namespace GWConquest
                 State.SpaceZoneID = Zone.GetZoneId(GetMainZone(ZoneType.Space));
                 State.AttackZoneID = Zone.GetZoneId(GetAttackZones(ZoneType.Ground)[0]);
             }
+            else {
+                planetName = State.PlanetName;
+                GetMainZone(ZoneType.Space).SetZoneId(State.SpaceZoneID);
+                GetAttackZones(ZoneType.Ground)[0].SetZoneId(State.AttackZoneID);
+
+                PlanetPlacement.Instance.InitPlanetPrefab(this);
+            }
         }
 
         public void UpdateConnectionsServer()
@@ -201,12 +210,29 @@ namespace GWConquest
             }
         }
 
+        public void UpdateConnectionsClient()
+        {
+            var pp = PlanetPlacement.Instance;
+
+            foreach(var entity in ConnectedPlanetsList)
+            {
+                var otherPlanet = entity.Entity.GetComponent<Planet>();
+                if(!IsConnectedTo(otherPlanet))
+                {
+                    pp.SpawnPlanetConnection(this, otherPlanet);
+                }
+            }
+        }
+
         public void FinishSetup()
         {
             if(entity.IsOwner)
             {
                 UpdateConnectionsServer();
             }
+            else {
+                UpdateConnectionsClient();
+            }
 
             pathfindingGraph = new PathfindingGraph<Zone>(groundZones);
             foreach(DistrictConnection conn in GetComponentsInChildren<DistrictConnection>())
diff --git a/Assets/GWConquest/Scripts/PlanetPlacement.cs b/Assets/GWConquest/Scripts/PlanetPlacement.cs
index 6c0c245..066df36 100644
--- a/Assets/GWConquest/Scripts/PlanetPlacement.cs
+++ b/Assets/GWConquest/Scripts/PlanetPlacement.cs
@@ -10,6 +10,18 @@ namespace GWConquest
 {
     public class PlanetPlacement : MonoBehaviour
     {
+        private static PlanetPlacement _instance;
+        public static PlanetPlacement Instance {
+            get {
+                if(_instance == null || !_instance.isActiveAndEnabled)
+                {
+                    _instance = FindObjectOfType<PlanetPlacement>();
+                }
+                return _instance;
+            }
+        }
+
+
         public GameObject PlanetConnectionPrefab;
         public Transform PlanetConnectionParent;
         public GameObject[] PlanetPrefabs;
@@ -62,21 +74,24 @@ namespace GWConquest
 
             int prefabId = Random.Range(0, PlanetPrefabs.Length);
             planet.State.PlanetPrefab = prefabId;
-            var prefab = PlanetPrefabs[prefabId];
-            var sphereGO = Instantiate(prefab);
-            sphereGO.transform.SetParent(planetGO.transform);
-            sphereGO.transform.localPosition = Vector3.zero;
-            sphereGO.transform.localRotation = Random.rotationUniform;
-
-            float scale = Random.Range(MinPlanetScale, MaxPlanetScale) * prefab.transform.localScale.x;
-            sphereGO.transform.localScale = scale * Vector3.one;
+            planet.State.PrefabRotation = Random.rotationUniform;
+            planet.State.PrefabScale = Random.Range(MinPlanetScale, MaxPlanetScale);
+            
+            InitPlanetPrefab(planet);
 
             return planet;
         }
 
         public void InitPlanetPrefab(Planet planet)
         {
-            
+            var prefab = PlanetPrefabs[planet.State.PlanetPrefab];
+            var sphereGO = Instantiate(prefab);
+            sphereGO.transform.SetParent(planet.transform);
+            sphereGO.transform.localPosition = Vector3.zero;
+            sphereGO.transform.localRotation = planet.State.PrefabRotation;
+
+            float scale = planet.State.PrefabScale * prefab.transform.localScale.x;
+            sphereGO.transform.localScale = scale * Vector3.one;
         }
 
         public PlanetConnection SpawnPlanetConnection(Planet planet1, Planet planet2)
diff --git a/Assets/GWConquest/Scripts/ServerCallbacks.cs b/Assets/GWConquest/Scripts/ServerCallbacks.cs
index 16c58db..9bc282b 100644
--- a/Assets/GWConquest/Scripts/ServerCallbacks.cs
+++ b/Assets/GWConquest/Scripts/ServerCallbacks.cs
@@ -12,17 +12,13 @@ namespace GWConquest
 
         public override void SceneLoadLocalDone(string scene, IProtocolToken token)
         {
-            FindObjectOfType<PlanetPlacement>().PlacePlanets();
+            PlanetPlacement.Instance.PlacePlanets();
 
             foreach(Planet planet in FindObjectsOfType<Planet>())
             {
                 planet.FinishSetup();
             }
 
-            Planet.SetupPlanetPathfinding();
-            BoltLog.Info("Setup planet pathfinding.");
-            //TODO Pathfinding on Client!!!
-
             BoltEntity playerEntity = BoltNetwork.Instantiate(BoltPrefabs.Player);
             Debug.Log("Player entity instantiated");
             IPlayerState playerState = playerEntity.GetState<IPlayerState>(); 
diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll
index 9d83ce8..b785fcc 100644
Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll differ
diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb
index d29880c..835180f 100644
Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb differ
diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json
index 3fc8f0a..9f4b907 100644
--- a/Assets/Photon/PhotonBolt/project.json
+++ b/Assets/Photon/PhotonBolt/project.json
@@ -2549,6 +2549,82 @@
             "ExtrapolationMaxFrames": 9,
             "SnapMagnitude": 10.0
           }
+        },
+        {
+          "Name": "PrefabRotation",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Photon.Bolt.Compiler.PropertyTypeQuaternion, bolt.compiler",
+            "Selection": 14,
+            "EulerCompression": [
+              {
+                "MaxValue": 360,
+                "Accuracy": 1.0,
+                "Pack": 1.0,
+                "Read": 1.0,
+                "BitsRequired": 9
+              },
+              {
+                "MaxValue": 360,
+                "Accuracy": 1.0,
+                "Pack": 1.0,
+                "Read": 1.0,
+                "BitsRequired": 9
+              },
+              {
+                "MaxValue": 360,
+                "Accuracy": 1.0,
+                "Pack": 1.0,
+                "Read": 1.0,
+                "BitsRequired": 9
+              }
+            ],
+            "QuaternionCompression": {
+              "MinValue": -1,
+              "MaxValue": 1,
+              "Accuracy": 0.01,
+              "Pack": 100.0,
+              "Read": 0.01,
+              "Shift": 1.0,
+              "BitsRequired": 8
+            }
+          },
+          "AssetSettings": {
+            "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
+        },
+        {
+          "Name": "PrefabScale",
+          "Enabled": true,
+          "Expanded": true,
+          "ReplicationMode": 1,
+          "Priority": 1,
+          "PropertyType": {
+            "$type": "Photon.Bolt.Compiler.PropertyTypeFloat, bolt.compiler",
+            "Compression": {
+              "MinValue": -2048,
+              "MaxValue": 2048,
+              "Accuracy": 0.01,
+              "Pack": 100.0,
+              "Read": 0.01,
+              "Shift": 2048.0,
+              "BitsRequired": 19
+            }
+          },
+          "AssetSettings": {
+            "$type": "Photon.Bolt.Compiler.PropertyStateSettings, bolt.compiler",
+            "ExtrapolationErrorTolerance": 0.25,
+            "_ExtrapolationCorrectionFrames": 6,
+            "ExtrapolationMaxFrames": 9,
+            "SnapMagnitude": 10.0
+          }
         }
       ],
       "PacketMaxBits": 512,
diff --git a/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset b/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset
index c07780b..b08a1fa 100644
--- a/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset
+++ b/Assets/Photon/PhotonBolt/resources/BoltRuntimeSettings.asset
@@ -31,7 +31,7 @@ MonoBehaviour:
     serverDejitterDelayMin: 3
     serverDejitterDelayMax: 9
     serverConnectionLimit: 64
-    serverConnectionAcceptMode: 0
+    serverConnectionAcceptMode: 1
     commandQueueSize: 60
     commandRedundancy: 6
     commandPingMultiplier: 1.25
@@ -53,7 +53,7 @@ MonoBehaviour:
   debugPlayAsServer: 0
   showDebugInfo: 0
   overrideTimeScale: 1
-  debugEditorMode: 1
+  debugEditorMode: 2
   consoleToggleKey: 9
   consoleVisibleByDefault: 0
   compilationWarnLevel: 4
diff --git a/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs b/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs
index b2c3fe3..30b3d25 100644
--- a/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs
+++ b/Assets/Photon/PhotonBolt/scripts/BoltDebugStart.cs
@@ -90,9 +90,9 @@ end tell'";
 
 		private IEnumerator DelayClientConnect()
 		{
-			for (int i = 0; i < 5; i++)
+			for (int i = 0; i < 8; i++)
 			{
-				BoltLog.Info("Connecting in {0} seconds...", 5 - i);
+				BoltLog.Info("Connecting in {0} seconds...", 8 - i);
 				yield return new WaitForSeconds(1);
 			}