diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..e29a8018a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,200 @@
+; see http://editorconfig.org/ for docs on this file
+
+root = true
+
+[*]
+ignore_if_in_header = This code was generated by a tool|<auto-generated>
+indent_style = space
+indent_size = 4
+; uncomment to help with sharing files across os's (i.e. network share or through local vm)
+#end_of_line = lf
+; avoid a bom, which causes endless problems with naive text tooling
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+; keeping auto-format enabled helps avoid merge hell for projects without CI-based format validation
+#disable_auto_format = true
+
+[*.cs]
+; uncomment to enable full formatting of c# files
+formatters = generic, uncrustify
+
+[*.asmdef]
+scrape_api = true
+
+[**/Tests/**.asmdef]
+scrape_api = false
+
+[*.Tests.asmdef]
+scrape_api = false
+
+[*.md]
+indent_size = 2
+; trailing whitespace is unfortunately significant in markdown
+trim_trailing_whitespace = false
+; uncomment to enable basic formatting of markdown files
+#formatters = generic
+
+[{Makefile,makefile}]
+; tab characters are part of the Makefile format
+indent_style = tab
+
+[*.asmdef]
+indent_size = 4
+
+[*.json]
+indent_size = 2
+
+[*.{vcproj,bat,cmd,xaml,tt,t4,ttinclude}]
+end_of_line = crlf
+
+; this VS-specific stuff is based on experiments to see how VS will modify a file after it has been manually edited.
+; the settings are meant to closely match what VS does to minimize unnecessary diffs.
+[*.{vcxproj,vcxproj.filters}]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8-bom
+trim_trailing_whitespace = true
+insert_final_newline = false
+; must be broken out because of 51-char bug (https://github.com/editorconfig/editorconfig-visualstudio/issues/21)
+[*.{csproj,pyproj,props,targets}]
+indent_style = space
+indent_size = 2
+end_of_line = crlf
+charset = utf-8-bom
+trim_trailing_whitespace = true
+insert_final_newline = false
+[*.{sln,sln.template}]
+indent_style = tab
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false
+
+#### naming styles ####
+
+# naming rules
+[*.cs]
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.method_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.method_should_be_pascal_case.symbols = method
+dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.private_or_internal_field_should_be_begins_with_m_.severity = suggestion
+dotnet_naming_rule.private_or_internal_field_should_be_begins_with_m_.symbols = private_or_internal_field
+dotnet_naming_rule.private_or_internal_field_should_be_begins_with_m_.style = begins_with_m_
+
+dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with_s_.severity = suggestion
+dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with_s_.symbols = private_or_internal_static_field
+dotnet_naming_rule.private_or_internal_static_field_should_be_begins_with_s_.style = begins_with_s_
+
+dotnet_naming_rule.non_public_const_fields_should_be_begins_with_k_.severity = suggestion
+dotnet_naming_rule.non_public_const_fields_should_be_begins_with_k_.symbols = non_public_const_fields
+dotnet_naming_rule.non_public_const_fields_should_be_begins_with_k_.style = begins_with_k_
+
+dotnet_naming_rule.non_public_static_readonly_fields_should_be_begins_with_k_.severity = suggestion
+dotnet_naming_rule.non_public_static_readonly_fields_should_be_begins_with_k_.symbols = non_public_static_readonly_fields
+dotnet_naming_rule.non_public_static_readonly_fields_should_be_begins_with_k_.style = begins_with_k_
+
+dotnet_naming_rule.event_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.event_should_be_camel_case.symbols = event
+dotnet_naming_rule.event_should_be_camel_case.style = camel_case
+
+dotnet_naming_rule.method_parameters_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.method_parameters_should_be_camel_case.symbols = method_parameters
+dotnet_naming_rule.method_parameters_should_be_camel_case.style = camel_case
+
+dotnet_naming_rule.local_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.local_should_be_camel_case.symbols = local
+dotnet_naming_rule.local_should_be_camel_case.style = camel_case
+
+# symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.event.applicable_kinds = event
+dotnet_naming_symbols.event.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.event.required_modifiers = 
+
+dotnet_naming_symbols.method.applicable_kinds = method
+dotnet_naming_symbols.method.applicable_accessibilities = public
+dotnet_naming_symbols.method.required_modifiers = 
+
+dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field
+dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected
+dotnet_naming_symbols.private_or_internal_field.required_modifiers = 
+
+dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds = field
+dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities = internal, private, private_protected
+dotnet_naming_symbols.private_or_internal_static_field.required_modifiers = static
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+dotnet_naming_symbols.non_public_const_fields.applicable_kinds = field
+dotnet_naming_symbols.non_public_const_fields.applicable_accessibilities = internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_public_const_fields.required_modifiers = const
+
+dotnet_naming_symbols.non_public_static_readonly_fields.applicable_kinds = field
+dotnet_naming_symbols.non_public_static_readonly_fields.applicable_accessibilities = private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_public_static_readonly_fields.required_modifiers = readonly, static
+
+dotnet_naming_symbols.method_parameters.applicable_kinds = parameter
+dotnet_naming_symbols.method_parameters.applicable_accessibilities = 
+dotnet_naming_symbols.method_parameters.required_modifiers = 
+
+dotnet_naming_symbols.local.applicable_kinds = local
+dotnet_naming_symbols.local.applicable_accessibilities = local
+dotnet_naming_symbols.local.required_modifiers = 
+
+# naming styles
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_m_.required_prefix = m_
+dotnet_naming_style.begins_with_m_.required_suffix = 
+dotnet_naming_style.begins_with_m_.word_separator = 
+dotnet_naming_style.begins_with_m_.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_s_.required_prefix = s_
+dotnet_naming_style.begins_with_s_.required_suffix = 
+dotnet_naming_style.begins_with_s_.word_separator = 
+dotnet_naming_style.begins_with_s_.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_k_.required_prefix = k_
+dotnet_naming_style.begins_with_k_.required_suffix = 
+dotnet_naming_style.begins_with_k_.word_separator = 
+dotnet_naming_style.begins_with_k_.capitalization = pascal_case
+
+dotnet_naming_style.camel_case.required_prefix = 
+dotnet_naming_style.camel_case.required_suffix = 
+dotnet_naming_style.camel_case.word_separator = 
+dotnet_naming_style.camel_case.capitalization = camel_case
diff --git a/.yamato/build.yml b/.yamato/build.yml
index 87af8f986..5082fca88 100644
--- a/.yamato/build.yml
+++ b/.yamato/build.yml
@@ -40,6 +40,7 @@ develop_pull_request_trigger:
   name: Develop Branch Triggers
   dependencies:
 {% for project in projects -%}
+    - .yamato/project-standards.yml#standards_{{ project.name }}
 {% for editor in test_editors -%}
 {% for platform in test_platforms -%}
     - .yamato/build.yml#build_{{ project.name }}_{{ editor }}_{{ platform.name }}
diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
new file mode 100644
index 000000000..e785f1c70
--- /dev/null
+++ b/.yamato/project-standards.yml
@@ -0,0 +1,22 @@
+{% metadata_file .yamato/project.metafile %}
+---
+  
+{% for project in projects -%}
+{% for editor in test_editors -%}
+
+standards_{{ project.name }}:
+  name: Standards Check {{ project.name }} - {{ editor }}
+  agent:
+    type: Unity::VM
+    image: desktop/logging-testing-linux:v0.1.2-926285
+    flavor: b1.large
+  commands:
+    - dotnet --version
+    - dotnet format --version
+    - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - unity-downloader-cli -u {{ test_editors.first }} -c editor --wait --fast
+    - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit
+    - dotnet run --project dotnet-tools/netcode.standards -- --project={{ project.path }} --check
+  
+{% endfor -%}
+{% endfor -%}
diff --git a/.yamato/project.metafile b/.yamato/project.metafile
index 589d945e4..77b7f0f43 100644
--- a/.yamato/project.metafile
+++ b/.yamato/project.metafile
@@ -32,4 +32,4 @@ projects:
   - name: dynamicaddressablesnetworkprefabs
     path: Basic/DynamicAddressablesNetworkPrefabs
   - name: multiplayerusecases
-    path: Experimental/MultiplayerUsecases
\ No newline at end of file
+    path: Experimental/MultiplayerUseCases
\ No newline at end of file
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs
index efcd1d334..b78a58c11 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Asteroid.cs
@@ -1,11 +1,11 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
 
 public class Asteroid : NetworkBehaviour
 {
     static string s_ObjectPoolTag = "ObjectPool";
-    
+
     public static int numAsteroids = 0;
 
     NetworkObjectPool m_ObjectPool;
@@ -14,7 +14,7 @@ public class Asteroid : NetworkBehaviour
 
     [SerializeField]
     private int m_NumCreates = 3;
-    
+
     [HideInInspector]
     public GameObject asteroidPrefab;
 
@@ -42,9 +42,9 @@ public void Explode()
             return;
         }
         Assert.IsTrue(NetworkManager.IsServer);
-        
+
         numAsteroids -= 1;
-        
+
         var newSize = Size.Value - 1;
 
         if (newSize > 0)
@@ -56,9 +56,9 @@ public void Explode()
                 int dx = Random.Range(0, 4) - 2;
                 int dy = Random.Range(0, 4) - 2;
                 Vector3 diff = new Vector3(dx * 0.3f, dy * 0.3f, 0);
-                
+
                 var go = m_ObjectPool.GetNetworkObject(asteroidPrefab, transform.position + diff, Quaternion.identity);
-                
+
                 var asteroid = go.GetComponent<Asteroid>();
                 asteroid.Size = new NetworkVariable<int>(newSize);
                 asteroid.asteroidPrefab = asteroidPrefab;
@@ -66,7 +66,7 @@ public void Explode()
                 go.GetComponent<Rigidbody2D>().AddForce(diff * 10, ForceMode2D.Impulse);
             }
         }
-        
+
         NetworkObject.Despawn(true);
     }
 }
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
index ad398c6ed..6ea5772cb 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Bullet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs b/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
index 30ed035fe..9b56af396 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/NetworkManagerHud.cs
@@ -14,35 +14,35 @@ public class NetworkManagerHud : MonoBehaviour
     NetworkManager m_NetworkManager;
 
     UnityTransport m_Transport;
-    
+
     // This is needed to make the port field more convenient. GUILayout.TextField is very limited and we want to be able to clear the field entirely so we can't cache this as ushort.
     string m_PortString = "7777";
     string m_ConnectAddress = "127.0.0.1";
-    
+
     [SerializeField]
     UIDocument m_MainMenuUIDocument;
 
     [SerializeField]
     UIDocument m_InGameUIDocument;
-    
+
     VisualElement m_MainMenuRootVisualElement;
 
     VisualElement m_InGameRootVisualElement;
-    
+
     Button m_HostButton;
-    
+
     Button m_ServerButton;
-    
+
     Button m_ClientButton;
 
     Button m_ShutdownButton;
-    
+
     TextField m_IPAddressField;
-    
+
     TextField m_PortField;
 
     TextElement m_MenuStatusText;
-    
+
     TextElement m_InGameStatusText;
 
     void Awake()
@@ -51,7 +51,7 @@ void Awake()
         m_NetworkManager = GetComponent<NetworkManager>();
 
         m_MainMenuRootVisualElement = m_MainMenuUIDocument.rootVisualElement;
-        
+
         m_IPAddressField = m_MainMenuRootVisualElement.Q<TextField>("IPAddressField");
         m_PortField = m_MainMenuRootVisualElement.Q<TextField>("PortField");
         m_HostButton = m_MainMenuRootVisualElement.Q<Button>("HostButton");
@@ -65,21 +65,21 @@ void Awake()
 
         m_IPAddressField.value = m_ConnectAddress;
         m_PortField.value = m_PortString;
-        
+
         m_HostButton.clickable.clickedWithEventInfo += HostButtonClicked;
         m_ServerButton.clickable.clickedWithEventInfo += ServerButtonClicked;
         m_ClientButton.clickable.clickedWithEventInfo += ClientButtonClicked;
         m_ShutdownButton.clickable.clickedWithEventInfo += ShutdownButtonClicked;
     }
-    
+
     void Start()
     {
         m_Transport = (UnityTransport)m_NetworkManager.NetworkConfig.NetworkTransport;
-        
+
         ShowMainMenuUI(true);
         ShowInGameUI(false);
         ShowStatusText(false);
-        
+
         NetworkManager.Singleton.OnClientConnectedCallback += OnOnClientConnectedCallback;
         NetworkManager.Singleton.OnClientDisconnectCallback += OnOnClientDisconnectCallback;
     }
@@ -99,7 +99,7 @@ void OnOnClientDisconnectCallback(ulong clientId)
         ShowMainMenuUI(true);
         ShowInGameUI(false);
     }
-    
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     bool IsRunning(NetworkManager networkManager) => networkManager.IsServer || networkManager.IsClient;
 
@@ -115,7 +115,7 @@ bool SetConnectionData()
             StartCoroutine(ShowInvalidInputStatus());
             return false;
         }
-        
+
         if (m_PortString == "")
         {
             m_MenuStatusText.text = "Port Invalid";
@@ -134,13 +134,13 @@ bool SetConnectionData()
         }
         return true;
     }
-    
+
     static string SanitizeInput(string dirtyString)
     {
         // sanitize the input for the ip address
         return Regex.Replace(dirtyString, "[^0-9.]", "");
     }
-    
+
     void HostButtonClicked(EventBase obj)
     {
         if (SetConnectionData())
@@ -148,7 +148,7 @@ void HostButtonClicked(EventBase obj)
             NetworkManager.Singleton.StartHost();
         }
     }
-    
+
     void ClientButtonClicked(EventBase obj)
     {
         if (SetConnectionData())
@@ -158,7 +158,7 @@ void ClientButtonClicked(EventBase obj)
             StartCoroutine(ShowConnectingStatus());
         }
     }
-    
+
     void ServerButtonClicked(EventBase obj)
     {
         if (SetConnectionData())
@@ -168,14 +168,14 @@ void ServerButtonClicked(EventBase obj)
             ShowInGameUI(true);
         }
     }
-    
+
     void ShutdownButtonClicked(EventBase obj)
     {
         m_NetworkManager.Shutdown();
         ShowMainMenuUI(true);
         ShowInGameUI(false);
     }
-    
+
     void ShowStatusText(bool visible)
     {
         m_MenuStatusText.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
@@ -186,18 +186,18 @@ IEnumerator ShowInvalidInputStatus()
         ShowStatusText(true);
 
         yield return new WaitForSeconds(3f);
-        
+
         ShowStatusText(false);
     }
-    
+
     IEnumerator ShowConnectingStatus()
     {
         m_MenuStatusText.text = "Attempting to Connect...";
         ShowStatusText(true);
-        
+
         m_HostButton.SetEnabled(false);
         m_ServerButton.SetEnabled(false);
-        
+
         var unityTransport = m_NetworkManager.GetComponent<UnityTransport>();
         var connectTimeoutMs = unityTransport.ConnectTimeoutMS;
         var maxConnectAttempts = unityTransport.MaxConnectAttempts;
@@ -206,13 +206,13 @@ IEnumerator ShowConnectingStatus()
 
         // wait to verify connect status
         yield return new WaitForSeconds(1f);
-        
+
         m_MenuStatusText.text = "Connection Attempt Failed";
         m_HostButton.SetEnabled(true);
         m_ServerButton.SetEnabled(true);
-        
+
         yield return new WaitForSeconds(3f);
-        
+
         ShowStatusText(false);
     }
 
@@ -224,7 +224,7 @@ void ShowMainMenuUI(bool visible)
     void ShowInGameUI(bool visible)
     {
         m_InGameRootVisualElement.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
-        
+
         if (m_NetworkManager.IsServer)
         {
             var mode = m_NetworkManager.IsHost ? "Host" : "Server";
@@ -240,7 +240,7 @@ void ShowInGameUI(bool visible)
             }
         }
     }
-    
+
     void OnDestroy()
     {
         if (m_HostButton != null)
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs b/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs
index ecb84e322..32bdb14b8 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Powerup.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -9,14 +9,14 @@ public class Powerup : NetworkBehaviour
     static string s_ObjectPoolTag = "ObjectPool";
 
     public static int numPowerUps = 0;
-    
+
     NetworkObjectPool m_ObjectPool;
 
     public NetworkVariable<Buff.BuffType> buffType = new NetworkVariable<Buff.BuffType>();
 
-    [SerializeField] 
+    [SerializeField]
     Renderer m_PowerUpGlow;
-    
+
     [SerializeField]
     Renderer m_PowerUpGlow2;
 
@@ -24,17 +24,17 @@ public class Powerup : NetworkBehaviour
     UIDocument m_PowerUpUIDocument;
 
     VisualElement m_PowerUpRootVisualElement;
-    
+
     VisualElement m_PowerUpUIWrapper;
-    
+
     TextElement m_PowerUpLabel;
 
     Camera m_MainCamera;
-    
+
     public Vector2 m_ScreenPosition;
 
     IPanel m_Panel;
-    
+
     void Awake()
     {
         m_ObjectPool = GameObject.FindWithTag(s_ObjectPoolTag).GetComponent<NetworkObjectPool>();
@@ -61,7 +61,7 @@ public override void OnNetworkSpawn()
         {
             OnStartServer();
         }
-        
+
         UpdateVisuals(buffType.Value);
         buffType.OnValueChanged += OnBuffTypeChanged;
     }
@@ -87,7 +87,7 @@ void OnStartServer()
     {
         numPowerUps += 1;
     }
-    
+
     void OnBuffTypeChanged(Buff.BuffType previousValue, Buff.BuffType newValue)
     {
         UpdateVisuals(newValue);
@@ -103,12 +103,12 @@ void UpdateVisuals(Buff.BuffType buffType)
         m_PowerUpGlow2.material.SetColor("_EmissiveColor", buffColor);
 
         m_PowerUpLabel.text = buffType.ToString().ToUpper();
-        
+
         if (buffType == Buff.BuffType.QuadDamage)
         {
             m_PowerUpLabel.text = "Quad Damage";
         }
-        
+
         m_PowerUpLabel.style.color = buffColor;
     }
 
@@ -145,7 +145,7 @@ void DestroyPowerUp()
     {
         AudioSource.PlayClipAtPoint(GetComponent<AudioSource>().clip, transform.position);
         numPowerUps -= 1;
-       
+
         NetworkObject.Despawn(true);
     }
 }
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs b/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs
index d8ff63191..46267bbc0 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/RandomPositionPlayerSpawner.cs
@@ -5,15 +5,15 @@
 using Random = UnityEngine.Random;
 
 [RequireComponent(typeof(NetworkManager))]
-public class RandomPositionPlayerSpawner: MonoBehaviour
+public class RandomPositionPlayerSpawner : MonoBehaviour
 {
     NetworkManager m_NetworkManager;
 
     int m_RoundRobinIndex = 0;
-    
+
     [SerializeField]
     SpawnMethod m_SpawnMethod;
-    
+
     [SerializeField]
     List<Vector3> m_SpawnPositions = new List<Vector3>() { Vector3.zero };
 
@@ -36,7 +36,7 @@ public Vector3 GetNextSpawnPosition()
                 throw new NotImplementedException();
         }
     }
-    
+
     private void Awake()
     {
         var networkManager = gameObject.GetComponent<NetworkManager>();
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
index 0f6afe4ef..7f31af39e 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/ShipControl.cs
@@ -1,4 +1,4 @@
-using Unity.Collections;
+using Unity.Collections;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -19,7 +19,7 @@ public enum BuffType
         Last
     };
 
-    public static Color[] buffColors = { Color.red, new Color(0.5f,0.3f,1), Color.cyan, Color.yellow, Color.green, Color.magenta, new Color(1, 0.5f, 0), new Color(0, 1, 0.5f) };
+    public static Color[] buffColors = { Color.red, new Color(0.5f, 0.3f, 1), Color.cyan, Color.yellow, Color.green, Color.magenta, new Color(1, 0.5f, 0), new Color(0, 1, 0.5f) };
 
     public static Color GetColor(BuffType bt)
     {
@@ -32,77 +32,77 @@ public class ShipControl : NetworkBehaviour
     static string s_ObjectPoolTag = "ObjectPool";
 
     NetworkObjectPool m_ObjectPool;
-    
+
     public GameObject BulletPrefab;
-    
+
     public AudioSource fireSound;
-    
+
     float m_RotateSpeed = 200f;
-    
+
     float m_Acceleration = 12f;
-    
+
     float m_BulletLifetime = 2;
-    
+
     float m_TopSpeed = 7.0f;
-    
+
     public NetworkVariable<int> Health = new NetworkVariable<int>(100);
-    
+
     public NetworkVariable<int> Energy = new NetworkVariable<int>(100);
-    
+
     public NetworkVariable<float> SpeedBuffTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> RotateBuffTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> TripleShotTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> DoubleShotTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> QuadDamageTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<float> BounceTimer = new NetworkVariable<float>(0f);
-    
+
     public NetworkVariable<Color> LatestShipColor = new NetworkVariable<Color>();
 
     float m_EnergyTimer = 0;
-    
+
     bool m_IsBuffed;
 
     public NetworkVariable<FixedString32Bytes> PlayerName = new NetworkVariable<FixedString32Bytes>(new FixedString32Bytes(""));
 
-    [SerializeField] 
+    [SerializeField]
     ParticleSystem m_Friction;
-    
-    [SerializeField] 
+
+    [SerializeField]
     ParticleSystem m_ThrustParticleSystem;
-    
-    [SerializeField] 
+
+    [SerializeField]
     SpriteRenderer m_ShipGlow;
-    
-    [SerializeField] 
+
+    [SerializeField]
     Color m_ShipGlowDefaultColor;
 
     [SerializeField]
     UIDocument m_UIDocument;
-    
+
     VisualElement m_RootVisualElement;
-    
+
     ProgressBar m_HealthBar;
-    
+
     ProgressBar m_EnergyBar;
-    
+
     VisualElement m_PlayerUIWrapper;
-    
+
     TextElement m_PlayerName;
-    
+
     Camera m_MainCamera;
-    
+
     ParticleSystem.MainModule m_ThrustMain;
 
     private NetworkVariable<float> m_FrictionEffectStartTimer = new NetworkVariable<float>(-10);
 
     // for client movement command throttling
     float m_OldMoveForce = 0;
-    
+
     float m_OldSpin = 0;
 
     // server movement
@@ -117,15 +117,15 @@ void Awake()
         m_Rigidbody2D = GetComponent<Rigidbody2D>();
         m_ObjectPool = GameObject.FindWithTag(s_ObjectPoolTag).GetComponent<NetworkObjectPool>();
         Assert.IsNotNull(m_ObjectPool, $"{nameof(NetworkObjectPool)} not found in scene. Did you apply the {s_ObjectPoolTag} to the GameObject?");
-        
+
         m_ThrustMain = m_ThrustParticleSystem.main;
         m_ShipGlow.color = m_ShipGlowDefaultColor;
         m_IsBuffed = false;
-        
+
         m_RootVisualElement = m_UIDocument.rootVisualElement;
         m_PlayerUIWrapper = m_RootVisualElement.Q<VisualElement>("PlayerUIWrapper");
-        m_HealthBar = m_RootVisualElement.Q<ProgressBar>(name:"HealthBar");
-        m_EnergyBar = m_RootVisualElement.Q<ProgressBar>(name:"EnergyBar");
+        m_HealthBar = m_RootVisualElement.Q<ProgressBar>(name: "HealthBar");
+        m_EnergyBar = m_RootVisualElement.Q<ProgressBar>(name: "EnergyBar");
         m_PlayerName = m_RootVisualElement.Q<TextElement>("PlayerName");
         m_MainCamera = Camera.main;
     }
@@ -141,9 +141,9 @@ public override void OnNetworkSpawn()
         if (IsServer)
         {
             LatestShipColor.Value = m_ShipGlowDefaultColor;
-            
+
             PlayerName.Value = $"Player {OwnerClientId}";
-            
+
             if (!IsHost)
             {
                 SetPlayerUIVisibility(false);
@@ -153,7 +153,7 @@ public override void OnNetworkSpawn()
         Health.OnValueChanged += OnHealthChanged;
         OnEnergyChanged(0, Energy.Value);
         OnHealthChanged(0, Health.Value);
-        
+
         SetPlayerName(PlayerName.Value.ToString().ToUpper());
     }
 
@@ -183,7 +183,7 @@ public void TakeDamage(int amount)
             Health.Value = 0;
 
             //todo: reset all buffs
-            
+
             Health.Value = 100;
             transform.position = NetworkManager.GetComponent<RandomPositionPlayerSpawner>().GetNextSpawnPosition();
             GetComponent<Rigidbody2D>().velocity = Vector3.zero;
@@ -211,7 +211,7 @@ void Fire(Vector3 direction)
         var bullet = bulletGo.GetComponent<Bullet>();
         bullet.Config(this, damage, bounce, m_BulletLifetime);
         bullet.SetVelocity(velocity);
-        
+
     }
 
     void Update()
@@ -299,7 +299,7 @@ private void HandleFrictionGraphics()
         var time = NetworkManager.ServerTime.Time;
         var start = m_FrictionEffectStartTimer.Value;
         var duration = m_Friction.main.duration;
-        
+
         bool frictionShouldBeActive = time >= start && time < start + duration; // 1f is the duration of the effect
 
         if (frictionShouldBeActive)
@@ -317,7 +317,7 @@ private void HandleFrictionGraphics()
             }
         }
     }
-    
+
     // changes color of the ship glow sprite and the trail effects based on the latest buff color
     void HandleBuffColors()
     {
@@ -460,7 +460,7 @@ public void AddBuff(Buff.BuffType buff)
                 Health.Value = 100;
             }
         }
-        
+
         if (buff == Buff.BuffType.QuadDamage)
         {
             QuadDamageTimer.Value = NetworkManager.ServerTime.TimeAsFloat + 10;
@@ -498,7 +498,7 @@ void OnCollisionEnter2D(Collision2D other)
     }
 
     // --- ClientRPCs ---
-    
+
     [ClientRpc]
     void PlayFireSoundClientRpc()
     {
@@ -548,13 +548,13 @@ public void SetNameServerRpc(string name)
     {
         PlayerName.Value = name;
     }
-    
+
     void SetWrapperPosition()
     {
         Vector2 screenPosition = RuntimePanelUtils.CameraTransformWorldToPanel(m_PlayerUIWrapper.panel, transform.position, m_MainCamera);
         m_PlayerUIWrapper.transform.position = screenPosition;
     }
-    
+
     void SetHealthBarValue(int healthBarValue)
     {
         m_HealthBar.value = healthBarValue;
@@ -569,7 +569,7 @@ void SetPlayerName(string playerName)
     {
         m_PlayerName.text = playerName;
     }
-    
+
     void SetPlayerUIVisibility(bool visible)
     {
         m_RootVisualElement.style.display = visible ? DisplayStyle.Flex : DisplayStyle.None;
diff --git a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs
index 3d0b1f453..6aa278724 100644
--- a/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs
+++ b/Basic/2DSpaceShooter/Assets/Scripts/Spawner.cs
@@ -1,11 +1,11 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 
 public class Spawner : MonoBehaviour
 {
     [SerializeField]
     NetworkObjectPool m_ObjectPool;
-    
+
     [SerializeField]
     private int m_Amount = 4;
 
@@ -15,13 +15,13 @@ public class Spawner : MonoBehaviour
     private GameObject m_AsteroidPrefab;
     [SerializeField]
     private GameObject m_ObstaclePrefab;
-    [SerializeField] 
+    [SerializeField]
     private GameObject m_ObstaclePrefab2;
-    [SerializeField] 
+    [SerializeField]
     private GameObject m_ObstaclePrefab3;
-    [SerializeField] 
+    [SerializeField]
     private GameObject m_ObstacleCornerPrefab;
-    
+
     // to easily visualize, search for "0". Blocks are spawned as shown below, but flipped horizontally. 
     static int[] s_Obstacles = new int[]
     {
@@ -95,11 +95,11 @@ void SpawnAsteroids()
             asteroid.NetworkObject.Spawn(true);
         }
     }
-    
+
     void SpawnObstacles()
     {
         // Obstacles are not networked we just spawn them as static objects on each peer
-        
+
         int y = 0;
         int x = 0;
         for (int i = 0; i < s_Obstacles.Length; i++)
@@ -108,17 +108,17 @@ void SpawnObstacles()
             {
                 Instantiate(m_ObstaclePrefab, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
             }
-            
+
             if (s_Obstacles[i] == 2)
             {
                 Instantiate(m_ObstacleCornerPrefab, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
             }
-            
+
             if (s_Obstacles[i] == 3)
             {
                 Instantiate(m_ObstaclePrefab2, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
             }
-            
+
             if (s_Obstacles[i] == 4)
             {
                 Instantiate(m_ObstaclePrefab3, new Vector3(-40 + x * 2, -40 + y * 2, 0), Quaternion.identity);
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs b/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs
index 3e97c7560..fde87ca30 100644
--- a/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ClientObjectWithIngredientType.cs
@@ -14,7 +14,7 @@ public class ClientObjectWithIngredientType : NetworkBehaviour
         Material m_RedMaterial;
 
         ServerObjectWithIngredientType m_Server;
-        
+
         [SerializeField]
         Renderer m_ColorMesh;
 
@@ -27,7 +27,7 @@ public override void OnNetworkSpawn()
         {
             base.OnNetworkSpawn();
             enabled = IsClient;
-            
+
             UpdateMaterial(default(IngredientType), m_Server.currentIngredientType.Value);
             m_Server.currentIngredientType.OnValueChanged += UpdateMaterial;
         }
@@ -53,4 +53,4 @@ void UpdateMaterial(IngredientType previousValue, IngredientType newValue)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs b/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs
index 3d493cc1d..17f94f6da 100644
--- a/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ClientPlayerColor.cs
@@ -17,6 +17,6 @@ public override void OnNetworkSpawn()
             // OwnerClientId is used here for debugging purposes. A live game should use a session manager to make sure reconnecting players still get the same color, as client IDs could be reused for other clients between disconnect and reconnect. See Boss Room for a session manager example.
             material.SetFloat("_Color_Index", OwnerClientId);
         }
-        
+
     }
 }
diff --git a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
index 2c6430f45..5c5d23992 100644
--- a/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs
@@ -36,7 +36,7 @@ void Awake()
     {
         Cursor.lockState = CursorLockMode.Locked;
         Cursor.visible = false;
-        
+
         // ThirdPersonController & CharacterController are enabled only on owning clients. Ghost player objects have
         // these two components disabled, and will enable a CapsuleCollider. Per the CharacterController documentation: 
         // https://docs.unity3d.com/Manual/CharacterControllers.html, a Character controller can push rigidbody
@@ -64,7 +64,7 @@ public override void OnNetworkSpawn()
         // player input is only enabled on owning players
         m_PlayerInput.enabled = true;
         m_ThirdPersonController.enabled = true;
-        
+
         // see the note inside ServerPlayerMove why this step is also necessary for synchronizing initial player
         // position on owning clients
         m_CharacterController.enabled = true;
diff --git a/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs b/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs
index e09131f72..bb021c520 100644
--- a/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs
+++ b/Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs
@@ -14,30 +14,30 @@ public class HostJoinUI : MonoBehaviour
     UIDocument m_InGameUIDocument;
 
     VisualElement m_MainMenuRootVisualElement;
-    
+
     VisualElement m_InGameRootVisualElement;
-    
+
     Button m_HostButton;
-    
+
     Button m_ServerButton;
-    
+
     Button m_ClientButton;
 
     TextField m_IPAddressTextField;
-    
+
     TextField m_PortTextField;
-    
+
     void Awake()
     {
         m_MainMenuRootVisualElement = m_MainMenuUIDocument.rootVisualElement;
         m_InGameRootVisualElement = m_InGameUIDocument.rootVisualElement;
-        
+
         m_HostButton = m_MainMenuRootVisualElement.Query<Button>("HostButton");
         m_ClientButton = m_MainMenuRootVisualElement.Query<Button>("ClientButton");
         m_ServerButton = m_MainMenuRootVisualElement.Query<Button>("ServerButton");
         m_IPAddressTextField = m_MainMenuRootVisualElement.Query<TextField>("IPAddressField");
         m_PortTextField = m_MainMenuRootVisualElement.Query<TextField>("PortField");
-        
+
         m_HostButton.clickable.clickedWithEventInfo += StartHost;
         m_ServerButton.clickable.clickedWithEventInfo += StartServer;
         m_ClientButton.clickable.clickedWithEventInfo += StartClient;
@@ -93,7 +93,7 @@ void ToggleMainMenuUI(bool isVisible)
     {
         m_MainMenuRootVisualElement.style.display = isVisible ? DisplayStyle.Flex : DisplayStyle.None;
     }
-    
+
     void ToggleInGameUI(bool isVisible)
     {
         m_InGameRootVisualElement.style.display = isVisible ? DisplayStyle.Flex : DisplayStyle.None;
@@ -105,11 +105,11 @@ void SetUtpConnectionData()
         var sanitizedPortText = Sanitize(m_PortTextField.text);
 
         ushort.TryParse(sanitizedPortText, out var port);
-        
+
         var utp = (UnityTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
         utp.SetConnectionData(sanitizedIPText, port);
     }
-    
+
     /// <summary>
     /// Sanitize user port InputField box allowing only alphanumerics and '.'
     /// </summary>
diff --git a/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs b/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs
index f83095d74..a7ce7485d 100644
--- a/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ScoreUI.cs
@@ -9,15 +9,15 @@ public class ScoreUI : MonoBehaviour
 
     [SerializeField]
     UIDocument m_InGameUIDocument;
-    
+
     VisualElement m_InGameRootVisualElement;
-    
+
     TextElement m_ScoreText;
 
     void Awake()
     {
         m_InGameRootVisualElement = m_InGameUIDocument.rootVisualElement;
-        
+
         m_ScoreText = m_InGameRootVisualElement.Query<TextElement>("ScoreText");
     }
 
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs b/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs
index 057dad66c..0998867f4 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredient.cs
@@ -19,7 +19,7 @@ public class ServerObjectWithIngredientType : NetworkBehaviour
     public NetworkVariable<IngredientType> currentIngredientType;
 
     public event Action ingredientDespawned;
-    
+
     public override void OnNetworkSpawn()
     {
         base.OnNetworkSpawn();
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
index 866e4ca7d..ad2d8819e 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerIngredientPhysics.cs
@@ -8,10 +8,10 @@ public class ServerIngredientPhysics : NetworkBehaviour
 {
     [SerializeField]
     NetworkTransform m_NetworkTransform;
-    
+
     [SerializeField]
     Rigidbody m_Rigidbody;
-    
+
     public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
     {
         SetPhysics(parentNetworkObject == null);
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
index d145d24f6..b1f1dab89 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs
@@ -11,7 +11,7 @@
 public class ServerPlayerMove : NetworkBehaviour
 {
     public NetworkVariable<bool> isObjectPickedUp = new NetworkVariable<bool>();
-    
+
     NetworkObject m_PickedUpObject;
 
     [SerializeField]
@@ -27,7 +27,7 @@ public override void OnNetworkSpawn()
         }
 
         OnServerSpawnPlayer();
-        
+
         base.OnNetworkSpawn();
     }
 
@@ -37,7 +37,7 @@ void OnServerSpawnPlayer()
         var spawnPoint = ServerPlayerSpawnPoints.Instance.ConsumeNextSpawnPoint();
         var spawnPosition = spawnPoint ? spawnPoint.transform.position : Vector3.zero;
         transform.position = spawnPosition;
-        
+
         // A note specific to owner authority:
         // Side Note:  Specific to Owner Authoritative
         // Setting the position works as and can be set in OnNetworkSpawn server-side unless there is a
@@ -50,7 +50,7 @@ void OnServerSpawnPlayer()
 
     [ServerRpc]
     public void PickupObjectServerRpc(ulong objToPickupID)
-    {        
+    {
         NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(objToPickupID, out var objectToPickup);
         if (objectToPickup == null || objectToPickup.transform.parent != null) return; // object already picked up, server authority says no
 
@@ -68,7 +68,7 @@ void IngredientDespawned()
         m_PickedUpObject = null;
         isObjectPickedUp.Value = false;
     }
-    
+
     [ServerRpc]
     public void DropObjectServerRpc()
     {
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs b/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs
index 222aa1701..70b2e0c71 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerPlayerSpawnPoints.cs
@@ -32,7 +32,7 @@ public GameObject ConsumeNextSpawnPoint()
         {
             return null;
         }
-        
+
         var toReturn = m_SpawnPoints[m_SpawnPoints.Count - 1];
         m_SpawnPoints.RemoveAt(m_SpawnPoints.Count - 1);
         return toReturn;
diff --git a/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs b/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs
index 137b0b62c..d49a3398e 100644
--- a/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs
+++ b/Basic/ClientDriven/Assets/Scripts/ServerScoreReplicator.cs
@@ -4,7 +4,7 @@ public class ServerScoreReplicator : NetworkBehaviour
 {
     NetworkVariable<int> m_ReplicatedScore = new NetworkVariable<int>();
 
-    public NetworkVariable<int> ReplicatedScore => m_ReplicatedScore; 
+    public NetworkVariable<int> ReplicatedScore => m_ReplicatedScore;
 
     public override void OnNetworkSpawn()
     {
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs
index ad8afa17b..b0a1516de 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/StarterAssetsDeployMenu.cs
@@ -27,7 +27,7 @@ public partial class StarterAssetsDeployMenu : ScriptableObject
         private const string CinemachineTargetTag = "CinemachineTarget";
 
         private static GameObject _cinemachineVirtualCamera;
-        
+
         /// <summary>
         /// Deletes the scripting define set by the Package Checker.
         /// See Assets/Editor/PackageChecker/PackageChecker.cs for more information
@@ -47,7 +47,7 @@ private static void CheckCameras(Transform targetParent, string prefabFolder)
 
             if (!vcam)
             {
-                if (TryLocatePrefab(CinemachineVirtualCameraName, new string[]{prefabFolder}, new[] { typeof(CinemachineVirtualCamera) }, out GameObject vcamPrefab, out string _))
+                if (TryLocatePrefab(CinemachineVirtualCameraName, new string[] { prefabFolder }, new[] { typeof(CinemachineVirtualCamera) }, out GameObject vcamPrefab, out string _))
                 {
                     HandleInstantiatingPrefab(vcamPrefab, out vcam);
                     _cinemachineVirtualCamera = vcam;
@@ -63,7 +63,7 @@ private static void CheckCameras(Transform targetParent, string prefabFolder)
             }
 
             GameObject[] targets = GameObject.FindGameObjectsWithTag(CinemachineTargetTag);
-            
+
             GameObject target = null;
             foreach (var t in targets)
             {
@@ -73,7 +73,7 @@ private static void CheckCameras(Transform targetParent, string prefabFolder)
                     break;
                 }
             }
-            
+
             if (target == null)
             {
                 target = new GameObject("PlayerCameraRoot");
@@ -93,7 +93,7 @@ private static void CheckMainCamera(string inFolder)
             if (mainCameras.Length < 1)
             {
                 // if there are no MainCameras, add one
-                if (TryLocatePrefab(MainCameraPrefabName, new string[]{inFolder}, new[] { typeof(CinemachineBrain), typeof(Camera) }, out GameObject camera, out string _))
+                if (TryLocatePrefab(MainCameraPrefabName, new string[] { inFolder }, new[] { typeof(CinemachineBrain), typeof(Camera) }, out GameObject camera, out string _))
                 {
                     HandleInstantiatingPrefab(camera, out _);
                 }
@@ -148,12 +148,12 @@ private static bool TryLocatePrefab(string name, string[] inFolders, System.Type
 
                         if (hasRequiredComponents)
                         {
-                             if (loadedGo.name == name)
-                             {
-                                 prefab = loadedGo;
-                                 path = assetPath;
-                                 return true;
-                             }                           
+                            if (loadedGo.name == name)
+                            {
+                                prefab = loadedGo;
+                                path = assetPath;
+                                return true;
+                            }
                         }
                     }
                 }
@@ -175,4 +175,4 @@ private static void HandleInstantiatingPrefab(GameObject prefab, out GameObject
         }
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs
index fbe8d9b72..58c8b96d5 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Editor/ThirdPersonStarterAssetsDeployMenu.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Text;
 using UnityEditor;
 using UnityEngine;
@@ -18,7 +18,7 @@ public partial class StarterAssetsDeployMenu : ScriptableObject
         static void ResetThirdPersonControllerArmature()
         {
             var thirdPersonControllers = FindObjectsOfType<ThirdPersonController>();
-            
+
             ThirdPersonController player = null;
             foreach (var controller in thirdPersonControllers)
             {
@@ -59,7 +59,7 @@ static void ResetThirdPersonControllerArmature()
         static void ResetThirdPersonControllerCapsule()
         {
             var thirdPersonControllers = FindObjectsOfType<ThirdPersonController>();
-            
+
             ThirdPersonController player = null;
             foreach (var controller in thirdPersonControllers)
             {
@@ -116,4 +116,4 @@ static string GetThirdPersonPrefabPath()
         }
 #endif
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs b/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
index d1aa1572c..57f0c21bb 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
@@ -5,76 +5,76 @@
 
 namespace StarterAssets
 {
-	public class StarterAssetsInputs : MonoBehaviour
-	{
-		[Header("Character Input Values")]
-		public Vector2 move;
-		public Vector2 look;
-		public bool jump;
-		public bool sprint;
+    public class StarterAssetsInputs : MonoBehaviour
+    {
+        [Header("Character Input Values")]
+        public Vector2 move;
+        public Vector2 look;
+        public bool jump;
+        public bool sprint;
 
-		[Header("Movement Settings")]
-		public bool analogMovement;
+        [Header("Movement Settings")]
+        public bool analogMovement;
 
-		[Header("Mouse Cursor Settings")]
-		public bool cursorLocked = true;
-		public bool cursorInputForLook = true;
+        [Header("Mouse Cursor Settings")]
+        public bool cursorLocked = true;
+        public bool cursorInputForLook = true;
 
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
-		public void OnMove(InputValue value)
-		{
-			MoveInput(value.Get<Vector2>());
-		}
+        public void OnMove(InputValue value)
+        {
+            MoveInput(value.Get<Vector2>());
+        }
 
-		public void OnLook(InputValue value)
-		{
-			if(cursorInputForLook)
-			{
-				LookInput(value.Get<Vector2>());
-			}
-		}
+        public void OnLook(InputValue value)
+        {
+            if (cursorInputForLook)
+            {
+                LookInput(value.Get<Vector2>());
+            }
+        }
 
-		public void OnJump(InputValue value)
-		{
-			JumpInput(value.isPressed);
-		}
+        public void OnJump(InputValue value)
+        {
+            JumpInput(value.isPressed);
+        }
 
-		public void OnSprint(InputValue value)
-		{
-			SprintInput(value.isPressed);
-		}
+        public void OnSprint(InputValue value)
+        {
+            SprintInput(value.isPressed);
+        }
 #endif
 
 
-		public void MoveInput(Vector2 newMoveDirection)
-		{
-			move = newMoveDirection;
-		} 
+        public void MoveInput(Vector2 newMoveDirection)
+        {
+            move = newMoveDirection;
+        }
 
-		public void LookInput(Vector2 newLookDirection)
-		{
-			look = newLookDirection;
-		}
+        public void LookInput(Vector2 newLookDirection)
+        {
+            look = newLookDirection;
+        }
 
-		public void JumpInput(bool newJumpState)
-		{
-			jump = newJumpState;
-		}
+        public void JumpInput(bool newJumpState)
+        {
+            jump = newJumpState;
+        }
 
-		public void SprintInput(bool newSprintState)
-		{
-			sprint = newSprintState;
-		}
+        public void SprintInput(bool newSprintState)
+        {
+            sprint = newSprintState;
+        }
 
-		private void OnApplicationFocus(bool hasFocus)
-		{
-			SetCursorState(cursorLocked);
-		}
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            SetCursorState(cursorLocked);
+        }
 
-		private void SetCursorState(bool newState)
-		{
-			Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
-		}
-	}
-	
-}
\ No newline at end of file
+        private void SetCursorState(bool newState)
+        {
+            Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
+        }
+    }
+
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs
index a7b41dd94..29c2e60be 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/CanvasInputs/UICanvasControllerInput.cs
@@ -27,7 +27,7 @@ public void VirtualSprintInput(bool virtualSprintState)
         {
             starterAssetsInputs.SprintInput(virtualSprintState);
         }
-        
+
     }
 
 }
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs
index 8c815ce3c..060a96f66 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/Utilities/MobileDisableAutoSwitchControls.cs
@@ -14,7 +14,7 @@ The PlayerInput component has an auto-switch control scheme action that allows a
 
 public class MobileDisableAutoSwitchControls : MonoBehaviour
 {
-    
+
 #if ENABLE_INPUT_SYSTEM && (UNITY_IOS || UNITY_ANDROID) && STARTER_ASSETS_PACKAGES_CHECKED
 
     [Header("Target")]
@@ -31,5 +31,5 @@ void DisableAutoSwitchControls()
     }
 
 #endif
-    
+
 }
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs
index 73bbc861c..9c0ada6e9 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualButton.cs
@@ -22,7 +22,7 @@ public void OnPointerUp(PointerEventData eventData)
     {
         OutputButtonStateValue(false);
     }
-    
+
     public void OnPointerClick(PointerEventData eventData)
     {
         OutputButtonClickEvent();
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs
index 2b255ceb4..39b0c4f01 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualJoystick.cs
@@ -6,7 +6,7 @@ public class UIVirtualJoystick : MonoBehaviour, IPointerDownHandler, IDragHandle
 {
     [System.Serializable]
     public class Event : UnityEvent<Vector2> { }
-    
+
     [Header("Rect References")]
     public RectTransform containerRect;
     public RectTransform handleRect;
@@ -27,7 +27,7 @@ void Start()
 
     private void SetupHandle()
     {
-        if(handleRect)
+        if (handleRect)
         {
             UpdateHandleRectPosition(Vector2.zero);
         }
@@ -42,29 +42,29 @@ public void OnDrag(PointerEventData eventData)
     {
 
         RectTransformUtility.ScreenPointToLocalPointInRectangle(containerRect, eventData.position, eventData.pressEventCamera, out Vector2 position);
-        
+
         position = ApplySizeDelta(position);
-        
+
         Vector2 clampedPosition = ClampValuesToMagnitude(position);
 
         Vector2 outputPosition = ApplyInversionFilter(position);
 
         OutputPointerEventValue(outputPosition * magnitudeMultiplier);
 
-        if(handleRect)
+        if (handleRect)
         {
             UpdateHandleRectPosition(clampedPosition * joystickRange);
         }
-        
+
     }
 
     public void OnPointerUp(PointerEventData eventData)
     {
         OutputPointerEventValue(Vector2.zero);
 
-        if(handleRect)
+        if (handleRect)
         {
-             UpdateHandleRectPosition(Vector2.zero);
+            UpdateHandleRectPosition(Vector2.zero);
         }
     }
 
@@ -80,8 +80,8 @@ private void UpdateHandleRectPosition(Vector2 newPosition)
 
     Vector2 ApplySizeDelta(Vector2 position)
     {
-        float x = (position.x/containerRect.sizeDelta.x) * 2.5f;
-        float y = (position.y/containerRect.sizeDelta.y) * 2.5f;
+        float x = (position.x / containerRect.sizeDelta.x) * 2.5f;
+        float y = (position.y / containerRect.sizeDelta.y) * 2.5f;
         return new Vector2(x, y);
     }
 
@@ -92,12 +92,12 @@ Vector2 ClampValuesToMagnitude(Vector2 position)
 
     Vector2 ApplyInversionFilter(Vector2 position)
     {
-        if(invertXOutputValue)
+        if (invertXOutputValue)
         {
             position.x = InvertValue(position.x);
         }
 
-        if(invertYOutputValue)
+        if (invertYOutputValue)
         {
             position.y = InvertValue(position.y);
         }
@@ -109,5 +109,5 @@ float InvertValue(float value)
     {
         return -value;
     }
-    
-}
\ No newline at end of file
+
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs
index 4abb21a94..ffc438d73 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/Mobile/Scripts/VirtualInputs/UIVirtualTouchZone.cs
@@ -31,9 +31,9 @@ void Start()
 
     private void SetupHandle()
     {
-        if(handleRect)
+        if (handleRect)
         {
-            SetObjectActiveState(handleRect.gameObject, false); 
+            SetObjectActiveState(handleRect.gameObject, false);
         }
     }
 
@@ -42,7 +42,7 @@ public void OnPointerDown(PointerEventData eventData)
 
         RectTransformUtility.ScreenPointToLocalPointInRectangle(containerRect, eventData.position, eventData.pressEventCamera, out pointerDownPosition);
 
-        if(handleRect)
+        if (handleRect)
         {
             SetObjectActiveState(handleRect.gameObject, true);
             UpdateHandleRectPosition(pointerDownPosition);
@@ -53,11 +53,11 @@ public void OnDrag(PointerEventData eventData)
     {
 
         RectTransformUtility.ScreenPointToLocalPointInRectangle(containerRect, eventData.position, eventData.pressEventCamera, out currentPointerPosition);
-        
+
         Vector2 positionDelta = GetDeltaBetweenPositions(pointerDownPosition, currentPointerPosition);
 
         Vector2 clampedPosition = ClampValuesToMagnitude(positionDelta);
-        
+
         Vector2 outputPosition = ApplyInversionFilter(clampedPosition);
 
         OutputPointerEventValue(outputPosition * magnitudeMultiplier);
@@ -70,7 +70,7 @@ public void OnPointerUp(PointerEventData eventData)
 
         OutputPointerEventValue(Vector2.zero);
 
-        if(handleRect)
+        if (handleRect)
         {
             SetObjectActiveState(handleRect.gameObject, false);
             UpdateHandleRectPosition(Vector2.zero);
@@ -104,12 +104,12 @@ Vector2 ClampValuesToMagnitude(Vector2 position)
 
     Vector2 ApplyInversionFilter(Vector2 position)
     {
-        if(invertXOutputValue)
+        if (invertXOutputValue)
         {
             position.x = InvertValue(position.x);
         }
 
-        if(invertYOutputValue)
+        if (invertYOutputValue)
         {
             position.y = InvertValue(position.y);
         }
@@ -121,5 +121,5 @@ float InvertValue(float value)
     {
         return -value;
     }
-    
+
 }
diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
index 7f1b3b172..9e8e5a81f 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
@@ -1,35 +1,35 @@
-using UnityEngine;
+using UnityEngine;
 
 public class BasicRigidBodyPush : MonoBehaviour
 {
-	public LayerMask pushLayers;
-	public bool canPush;
-	[Range(0.5f, 5f)] public float strength = 1.1f;
+    public LayerMask pushLayers;
+    public bool canPush;
+    [Range(0.5f, 5f)] public float strength = 1.1f;
 
-	private void OnControllerColliderHit(ControllerColliderHit hit)
-	{
-		if (canPush) PushRigidBodies(hit);
-	}
+    private void OnControllerColliderHit(ControllerColliderHit hit)
+    {
+        if (canPush) PushRigidBodies(hit);
+    }
 
-	private void PushRigidBodies(ControllerColliderHit hit)
-	{
-		// https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
+    private void PushRigidBodies(ControllerColliderHit hit)
+    {
+        // https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
 
-		// make sure we hit a non kinematic rigidbody
-		Rigidbody body = hit.collider.attachedRigidbody;
-		if (body == null || body.isKinematic) return;
+        // make sure we hit a non kinematic rigidbody
+        Rigidbody body = hit.collider.attachedRigidbody;
+        if (body == null || body.isKinematic) return;
 
-		// make sure we only push desired layer(s)
-		var bodyLayerMask = 1 << body.gameObject.layer;
-		if ((bodyLayerMask & pushLayers.value) == 0) return;
+        // make sure we only push desired layer(s)
+        var bodyLayerMask = 1 << body.gameObject.layer;
+        if ((bodyLayerMask & pushLayers.value) == 0) return;
 
-		// We dont want to push objects below us
-		if (hit.moveDirection.y < -0.3f) return;
+        // We dont want to push objects below us
+        if (hit.moveDirection.y < -0.3f) return;
 
-		// Calculate push direction from move direction, horizontal motion only
-		Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
+        // Calculate push direction from move direction, horizontal motion only
+        Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
 
-		// Apply the push and take strength into account
-		body.AddForce(pushDir * strength, ForceMode.Impulse);
-	}
-}
\ No newline at end of file
+        // Apply the push and take strength into account
+        body.AddForce(pushDir * strength, ForceMode.Impulse);
+    }
+}
diff --git a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
index 9acb269f3..8eaeb112a 100644
--- a/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
+++ b/Basic/ClientDriven/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
 using UnityEngine.InputSystem;
 #endif
@@ -135,7 +135,7 @@ private void Awake()
         private void Start()
         {
             _cinemachineTargetYaw = CinemachineCameraTarget.transform.rotation.eulerAngles.y;
-            
+
             _hasAnimator = TryGetComponent(out _animator);
             _controller = GetComponent<CharacterController>();
             _input = GetComponent<StarterAssetsInputs>();
@@ -393,4 +393,4 @@ private void OnLand(AnimationEvent animationEvent)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
index bceb33eed..94d53084e 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/00_Preloading/Preloading.cs
@@ -21,9 +21,9 @@ namespace Game.Preloading
     public sealed class Preloading : MonoBehaviour
     {
         [SerializeField] AssetReferenceGameObject m_DynamicPrefabReference;
-        
+
         [SerializeField] NetworkManager m_NetworkManager;
-        
+
         async void Start()
         {
             await PreloadDynamicPlayerPrefab();
@@ -35,18 +35,18 @@ async void Start()
         async Task PreloadDynamicPlayerPrefab()
         {
             Debug.Log($"Started to load addressable with GUID: {m_DynamicPrefabReference.AssetGUID}");
-            var op =  Addressables.LoadAssetAsync<GameObject>(m_DynamicPrefabReference);
+            var op = Addressables.LoadAssetAsync<GameObject>(m_DynamicPrefabReference);
             var prefab = await op.Task;
             Addressables.Release(op);
-            
+
             //it's important to actually add the player prefab to the list of network prefabs - it doesn't happen
             //automatically
             m_NetworkManager.AddNetworkPrefab(prefab);
             Debug.Log($"Loaded prefab has been assigned to NetworkManager's PlayerPrefab");
-            
+
             // at this point we can easily change the PlayerPrefab
             m_NetworkManager.NetworkConfig.PlayerPrefab = prefab;
-            
+
             // Forcing all game instances to load a set of network prefabs and having each game instance inject network
             // prefabs to NetworkManager's NetworkPrefabs list pre-connection time guarantees that all players will have
             // matching NetworkConfigs. This is why NetworkManager.ForceSamePrefabs is set to true. We let Netcode for
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs
index 3763cadb0..4b5c802ec 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/01_Connection Approval/ConnectionApproval.cs	
@@ -20,13 +20,13 @@ public sealed class ConnectionApproval : NetworkBehaviour
 
         [SerializeField]
         AssetReferenceGameObject m_AssetReferenceGameObject;
-        
+
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
@@ -34,7 +34,7 @@ void Start()
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection. In this implementation of the connection approval
             // callback, the server validates the client's connection payload based on the hash of their dynamic prefabs
@@ -53,16 +53,16 @@ void Start()
 
         async void LoadAPrefab()
         {
-            var assetGuid = new AddressableGUID() { Value = m_AssetReferenceGameObject.AssetGUID }; 
-            
+            var assetGuid = new AddressableGUID() { Value = m_AssetReferenceGameObject.AssetGUID };
+
             // server is starting to load a prefab, update UI
-            m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, 
-                assetGuid.GetHashCode(), 
-                "Undefined", 
+            m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId,
+                assetGuid.GetHashCode(),
+                "Undefined",
                 InGameUI.LoadStatus.Loading);
-            
+
             await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, 0);
-            
+
             // server loaded a prefab, update UI with the loaded asset's name
             DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
             m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
@@ -75,27 +75,27 @@ public override void OnDestroy()
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
             base.OnDestroy();
         }
-    
+
         void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response)
         {
             Debug.Log($"Client {request.ClientNetworkId} is trying to connect ");
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 //allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -103,36 +103,36 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-    
+
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
                 //immediately approve the connection if we haven't loaded any prefabs yet
                 Approve();
                 return;
             }
-    
+
             var payload = System.Text.Encoding.UTF8.GetString(connectionData);
             var connectionPayload = JsonUtility.FromJson<ConnectionPayload>(payload); // https://docs.unity3d.com/2020.2/Documentation/Manual/JSONSerialization.html
-    
+
             int clientPrefabHash = connectionPayload.hashOfDynamicPrefabGUIDs;
             int serverPrefabHash = DynamicPrefabLoadingUtilities.HashOfDynamicPrefabGUIDs;
-            
+
             //if the client has the same prefabs as the server - approve the connection
             if (clientPrefabHash == serverPrefabHash)
             {
                 Approve();
 
                 DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAllPrefabs(clientId);
-                
+
                 return;
             }
-            
+
             // In order for clients to not just get disconnected with no feedback, the server needs to tell the client
             // why it disconnected it. This could happen after an auth check on a service or because of gameplay
             // reasons (server full, wrong build version, etc).
             // The server can do so via the DisconnectReason in the ConnectionApprovalResponse. The guids of the prefabs
             // the client will need to load will be sent, such that the client loads the needed prefabs, and reconnects.
-            
+
             // A note: DisconnectReason will not be written to if the string is too large in size. This should be used
             // only to tell the client "why" it failed -- the client should instead use services like UGS to fetch the
             // relevant data it needs to fetch & download.
@@ -140,21 +140,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             DynamicPrefabLoadingUtilities.RefreshLoadedPrefabGuids();
 
             response.Reason = DynamicPrefabLoadingUtilities.GenerateDisconnectionPayload();
-            
+
             ImmediateDeny();
-            
+
             // A note: sending large strings through Netcode is not ideal -- you'd usually want to use REST services to
             // accomplish this instead. UGS services like Lobby can be a useful alternative. Another route may be to
             // set ConnectionApprovalResponse's Pending flag to true, and send a CustomMessage containing the array of 
             // GUIDs to a client, which the client would load and reattempt a reconnection.
-    
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs
index c66736006..d1b7173db 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/02_Server Authoritative Load All Async/ServerAuthoritativeLoadAllAsync.cs	
@@ -23,20 +23,20 @@ public sealed class ServerAuthoritativeLoadAllAsync : NetworkBehaviour
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
 
         [SerializeField]
         InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
 
         const int k_MaxConnectPayload = 1024;
-        
+
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             // Note: we will define a very simplistic connection approval below, which will effectively deny all
@@ -44,16 +44,16 @@ void Start()
             // a connection approval callback, but late-joining clients will have mismatching NetworkConfigs (and  
             // potentially different world versions if the server has spawned a dynamic prefab).
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
-            
+
             // This is a simplistic use-case of a connection approval callback. To see how a connection approval should
             // be used to validate a user's connection payload, see the connection approval use-case, or the
             // APIPlayground, where all post-connection techniques are used in harmony.
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.LoadAllAsyncButtonPressed += OnClickedPreload;
         }
@@ -68,27 +68,27 @@ public override void OnDestroy()
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
             base.OnDestroy();
         }
-        
+
         void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response)
         {
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 // allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -96,7 +96,7 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-            
+
             // simple approval if the server has not loaded any dynamic prefabs yet
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
@@ -106,14 +106,14 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             {
                 ImmediateDeny();
             }
-            
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -121,7 +121,7 @@ void ImmediateDeny()
                 response.CreatePlayerObject = false;
             }
         }
-        
+
         // invoked by UI
         public void OnClickedPreload()
         {
@@ -129,7 +129,7 @@ public void OnClickedPreload()
             {
                 return;
             }
-            
+
             PreloadPrefabs();
         }
 
@@ -156,38 +156,38 @@ async Task PreloadDynamicPrefabOnServerAndStartLoadingOnAllClients(string guid)
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers");
                     return;
                 }
-                
+
                 // update UI for each client that is requested to load a certain prefab
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
                     m_InGameUI.ClientLoadedPrefabStatusChanged(client, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
                 }
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
-                
+
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
                     m_InGameUI.ClientLoadedPrefabStatusChanged(client,
-                        assetGuid.GetHashCode(), 
-                        loadedGameObject.Result.name, 
+                        assetGuid.GetHashCode(),
+                        loadedGameObject.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -200,24 +200,24 @@ async void Load(AddressableGUID assetGuid)
             {
                 // loading prefab as a client, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
             DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, rpcParams.Receive.SenderClientId);
-            
+
             // a quick way to grab a matching prefab reference's name via its prefabHash
             var loadedPrefabName = "Undefined";
             foreach (var prefabReference in m_DynamicPrefabReferences)
@@ -227,7 +227,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -236,7 +236,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs
index 384b6e52b..98cb068de 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/03_Server Authoritative Synchronous Spawning/ServerAuthoritativeSynchronousSpawning.cs	
@@ -29,23 +29,23 @@ public sealed class ServerAuthoritativeSynchronousSpawning : NetworkBehaviour
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
 
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         float m_SynchronousSpawnTimeoutTimer;
-        
+
         int m_SynchronousSpawnAckCount = 0;
-        
+
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             // Note: we will define a very simplistic connection approval below, which will effectively deny all
@@ -53,20 +53,20 @@ void Start()
             // a connection approval callback, but late-joining clients will have mismatching NetworkConfigs (and  
             // potentially different world versions if the server has spawned a dynamic prefab).
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
-            
+
             // This is a simplistic use-case of a connection approval callback. To see how a connection approval should
             // be used to validate a user's connection payload, see the connection approval use-case, or the
             // APIPlayground, where all post-connection techniques are used in harmony.
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.TrySpawnSynchronouslyButtonPressed += OnClickedTrySpawnSynchronously;
         }
-        
+
         public override void OnDestroy()
         {
             m_NetworkManager.ConnectionApprovalCallback -= ConnectionApprovalCallback;
@@ -83,21 +83,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 // allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -105,7 +105,7 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-            
+
             // simple approval if the server has not loaded any dynamic prefabs yet
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
@@ -115,14 +115,14 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             {
                 ImmediateDeny();
             }
-            
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -138,10 +138,10 @@ void OnClickedTrySpawnSynchronously()
             {
                 return;
             }
-            
+
             TrySpawnSynchronously();
         }
-        
+
         async void TrySpawnSynchronously()
         {
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
@@ -162,33 +162,33 @@ async void TrySpawnSynchronously()
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers, we can spawn it immediately");
                     var obj = Spawn(assetGuid);
                     return (true, obj);
                 }
-                
+
                 m_SynchronousSpawnAckCount = 0;
                 m_SynchronousSpawnTimeoutTimer = 0;
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
-                
+
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 //load the prefab on the server, so that any late-joiner will need to load that prefab also
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
-                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 : 
+
+                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 :
                     m_NetworkManager.ConnectedClients.Count;
-                
+
                 while (m_SynchronousSpawnTimeoutTimer < m_InGameUI.NetworkSpawnTimeoutSeconds)
                 {
                     if (m_SynchronousSpawnAckCount >= requiredAcknowledgementsCount)
@@ -197,11 +197,11 @@ async void TrySpawnSynchronously()
                         var obj = Spawn(assetGuid);
                         return (true, obj);
                     }
-                    
+
                     m_SynchronousSpawnTimeoutTimer += Time.deltaTime;
                     await Task.Yield();
                 }
-                
+
                 // left to the reader: you'll need to be reactive to clients failing to load -- you should either have
                 // the offending client try again or disconnect it after a predetermined amount of failed attempts
                 Debug.LogError("Failed to spawn dynamic prefab - timeout");
@@ -220,20 +220,20 @@ NetworkObject Spawn(AddressableGUID assetGuid)
                 var obj = Instantiate(prefab.Result, position, rotation).GetComponent<NetworkObject>();
                 obj.Spawn();
                 Debug.Log("Spawned dynamic prefab");
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
-                    m_InGameUI.ClientLoadedPrefabStatusChanged(client, 
-                        assetGuid.GetHashCode(), 
-                        prefab.Result.name, 
+                    m_InGameUI.ClientLoadedPrefabStatusChanged(client,
+                        assetGuid.GetHashCode(),
+                        prefab.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
-                
+
                 return obj;
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -246,26 +246,26 @@ async void Load(AddressableGUID assetGuid)
             {
                 // loading prefab as a client, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             m_SynchronousSpawnAckCount++;
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
-            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, 
+            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash,
                 rpcParams.Receive.SenderClientId);
-            
+
             // a quick way to grab a matching prefab reference's name via its prefabHash
             var loadedPrefabName = "Undefined";
             foreach (var prefabReference in m_DynamicPrefabReferences)
@@ -275,7 +275,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -284,7 +284,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs
index 4b391df2b..51f250728 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/04_Server Authoritative Network-Visibility Spawning/ServerAuthoritativeNetworkVisibilitySpawning.cs	
@@ -30,22 +30,22 @@ public sealed class ServerAuthoritativeNetworkVisibilitySpawning : NetworkBehavi
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
-        
+
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         //A storage where we keep association between prefab (hash of it's GUID) and the spawned network objects that use it
         Dictionary<int, HashSet<NetworkObject>> m_PrefabHashToNetworkObjectId = new Dictionary<int, HashSet<NetworkObject>>();
 
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             // Note: we will define a very simplistic connection approval below, which will effectively deny all
@@ -53,20 +53,20 @@ void Start()
             // a connection approval callback, but late-joining clients will have mismatching NetworkConfigs (and  
             // potentially different world versions if the server has spawned a dynamic prefab).
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
-            
+
             // This is a simplistic use-case of a connection approval callback. To see how a connection approval should
             // be used to validate a user's connection payload, see the connection approval use-case, or the
             // APIPlayground, where all post-connection techniques are used in harmony.
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.SpawnUsingVisibilityButtonPressed += OnClickedTrySpawnInvisible;
         }
-        
+
         public override void OnDestroy()
         {
             m_NetworkManager.ConnectionApprovalCallback -= ConnectionApprovalCallback;
@@ -77,27 +77,27 @@ public override void OnDestroy()
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
             base.OnDestroy();
         }
-        
+
         void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response)
         {
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 // allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -105,7 +105,7 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-            
+
             // simple approval if the server has not loaded any dynamic prefabs yet
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
@@ -115,14 +115,14 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             {
                 ImmediateDeny();
             }
-            
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -130,7 +130,7 @@ void ImmediateDeny()
                 response.CreatePlayerObject = false;
             }
         }
-        
+
         // invoked by UI
         void OnClickedTrySpawnInvisible()
         {
@@ -138,7 +138,7 @@ void OnClickedTrySpawnInvisible()
             {
                 return;
             }
-            
+
             TrySpawnInvisible();
         }
 
@@ -147,7 +147,7 @@ async void TrySpawnInvisible()
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
             await SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(randomPrefab.AssetGUID, Random.insideUnitCircle * 5, Quaternion.identity);
         }
-        
+
         /// <summary>
         /// This call spawns an addressable prefab by it's guid. It does not ensure that all the clients have loaded the
         /// prefab before spawning it. All spawned objects are network-invisible to clients that don't have the prefab
@@ -164,7 +164,7 @@ async Task<NetworkObject> SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(str
                 {
                     Value = guid
                 };
-                
+
                 return await Spawn(assetGuid);
             }
 
@@ -174,56 +174,56 @@ async Task<NetworkObject> Spawn(AddressableGUID assetGuid)
             {
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
-                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, 
+
+                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid,
                     m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 var obj = Instantiate(prefab, position, rotation).GetComponent<NetworkObject>();
-                
+
                 if (m_PrefabHashToNetworkObjectId.TryGetValue(assetGuid.GetHashCode(), out var networkObjectIds))
                 {
                     networkObjectIds.Add(obj);
                 }
                 else
                 {
-                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() {obj});
+                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() { obj });
                 }
 
                 // This gets called on spawn and makes sure clients currently syncing and receiving spawns have the
                 // appropriate network visibility settings automatically. This can happen on late join, on spawn, on
                 // scene switch, etc.
-                obj.CheckObjectVisibility = (clientId) => 
+                obj.CheckObjectVisibility = (clientId) =>
                 {
                     if (clientId == NetworkManager.ServerClientId)
                     {
                         // object is loaded on the server, no need to validate for visibility
                         return true;
                     }
-                    
+
                     //if the client has already loaded the prefab - we can make the object network-visible to them
                     if (DynamicPrefabLoadingUtilities.HasClientLoadedPrefab(clientId, assetGuid.GetHashCode()))
                     {
                         return true;
                     }
-                    
+
                     // client is loading a prefab, update UI
                     m_InGameUI.ClientLoadedPrefabStatusChanged(clientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                    
+
                     //otherwise the clients need to load the prefab, and after they ack - the ShowHiddenObjectsToClient 
-                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams(){Send = new ClientRpcSendParams(){TargetClientIds = new ulong[]{clientId}}});
+                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams() { Send = new ClientRpcSendParams() { TargetClientIds = new ulong[] { clientId } } });
                     return false;
                 };
-                
+
                 obj.Spawn();
 
                 return obj;
             }
         }
-        
+
         void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
         {
             if (m_PrefabHashToNetworkObjectId.TryGetValue(prefabHash, out var networkObjects))
@@ -237,7 +237,7 @@ void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
                 }
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -250,25 +250,25 @@ async void Load(AddressableGUID assetGuid)
             {
                 // loading prefab as a client, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
-                
+
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
-                
+
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
-            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, 
+            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash,
                 rpcParams.Receive.SenderClientId);
-           
+
             //the server has all the objects network-visible, no need to do anything
             if (rpcParams.Receive.SenderClientId != m_NetworkManager.LocalClientId)
             {
@@ -278,7 +278,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 // and/or visually) to that player, giving them a potential advantage.
                 ShowHiddenObjectsToClient(prefabHash, rpcParams.Receive.SenderClientId);
             }
-            
+
             // a quick way to grab a matching prefab reference's name via its prefabHash
             var loadedPrefabName = "Undefined";
             foreach (var prefabReference in m_DynamicPrefabReferences)
@@ -288,7 +288,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -297,7 +297,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs
index f1cc3e08d..a32d588b8 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs	
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/05_API Playground/APIPlayground.cs	
@@ -25,41 +25,41 @@ public sealed class APIPlayground : NetworkBehaviour
     {
         [SerializeField]
         NetworkManager m_NetworkManager;
-        
+
         [SerializeField] List<AssetReferenceGameObject> m_DynamicPrefabReferences;
-        
+
         [SerializeField] InGameUI m_InGameUI;
-        
+
         const int k_MaxConnectedClientCount = 4;
-        
+
         const int k_MaxConnectPayload = 1024;
-        
+
         //A storage where we keep association between prefab (hash of it's GUID) and the spawned network objects that use it
         Dictionary<int, HashSet<NetworkObject>> m_PrefabHashToNetworkObjectId = new Dictionary<int, HashSet<NetworkObject>>();
-        
+
         float m_SynchronousSpawnTimeoutTimer;
-        
+
         int m_SynchronousSpawnAckCount = 0;
 
         void Start()
         {
             DynamicPrefabLoadingUtilities.Init(m_NetworkManager);
-            
+
             // In the use-cases where connection approval is implemented, the server can begin to validate a user's
             // connection payload, and either approve or deny connection to the joining client.
             m_NetworkManager.NetworkConfig.ConnectionApproval = true;
-            
+
             // Here, we keep ForceSamePrefabs disabled. This will allow us to dynamically add network prefabs to Netcode
             // for GameObject after establishing a connection.
             m_NetworkManager.NetworkConfig.ForceSamePrefabs = false;
             m_NetworkManager.ConnectionApprovalCallback += ConnectionApprovalCallback;
-            
+
             // hooking up UI callbacks
             m_InGameUI.LoadAllAsyncButtonPressed += OnClickedPreload;
             m_InGameUI.TrySpawnSynchronouslyButtonPressed += OnClickedTrySpawnSynchronously;
             m_InGameUI.SpawnUsingVisibilityButtonPressed += OnClickedTrySpawnInvisible;
         }
-        
+
         public override void OnDestroy()
         {
             m_NetworkManager.ConnectionApprovalCallback -= ConnectionApprovalCallback;
@@ -78,21 +78,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             Debug.Log("Client is trying to connect " + request.ClientNetworkId);
             var connectionData = request.Payload;
             var clientId = request.ClientNetworkId;
-            
+
             if (clientId == m_NetworkManager.LocalClientId)
             {
                 //allow the host to connect
                 Approve();
                 return;
             }
-            
+
             // A sample-specific denial on clients after k_MaxConnectedClientCount clients have been connected
             if (m_NetworkManager.ConnectedClientsList.Count >= k_MaxConnectedClientCount)
             {
                 ImmediateDeny();
                 return;
             }
-            
+
             if (connectionData.Length > k_MaxConnectPayload)
             {
                 // If connectionData is too big, deny immediately to avoid wasting time on the server. This is intended as
@@ -100,36 +100,36 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
                 ImmediateDeny();
                 return;
             }
-    
+
             if (DynamicPrefabLoadingUtilities.LoadedPrefabCount == 0)
             {
                 //immediately approve the connection if we haven't loaded any prefabs yet
                 Approve();
                 return;
             }
-    
+
             var payload = System.Text.Encoding.UTF8.GetString(connectionData);
             var connectionPayload = JsonUtility.FromJson<ConnectionPayload>(payload); // https://docs.unity3d.com/2020.2/Documentation/Manual/JSONSerialization.html
-    
+
             int clientPrefabHash = connectionPayload.hashOfDynamicPrefabGUIDs;
             int serverPrefabHash = DynamicPrefabLoadingUtilities.HashOfDynamicPrefabGUIDs;
-            
+
             //if the client has the same prefabs as the server - approve the connection
             if (clientPrefabHash == serverPrefabHash)
             {
                 Approve();
 
                 DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAllPrefabs(clientId);
-                
+
                 return;
             }
-            
+
             // In order for clients to not just get disconnected with no feedback, the server needs to tell the client
             // why it disconnected it. This could happen after an auth check on a service or because of gameplay
             // reasons (server full, wrong build version, etc).
             // The server can do so via the DisconnectReason in the ConnectionApprovalResponse. The guids of the prefabs
             // the client will need to load will be sent, such that the client loads the needed prefabs, and reconnects.
-            
+
             // A note: DisconnectReason will not be written to if the string is too large in size. This should be used
             // only to tell the client "why" it failed -- the client should instead use services like UGS to fetch the
             // relevant data it needs to fetch & download.
@@ -137,21 +137,21 @@ void ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request
             DynamicPrefabLoadingUtilities.RefreshLoadedPrefabGuids();
 
             response.Reason = DynamicPrefabLoadingUtilities.GenerateDisconnectionPayload();
-            
+
             ImmediateDeny();
-            
+
             // A note: sending large strings through Netcode is not ideal -- you'd usually want to use REST services to
             // accomplish this instead. UGS services like Lobby can be a useful alternative. Another route may be to
             // set ConnectionApprovalResponse's Pending flag to true, and send a CustomMessage containing the array of 
             // GUIDs to a client, which the client would load and reattempt a reconnection.
-    
+
             void Approve()
             {
                 Debug.Log($"Client {clientId} approved");
                 response.Approved = true;
                 response.CreatePlayerObject = false; //we're not going to spawn a player object for this sample
             }
-            
+
             void ImmediateDeny()
             {
                 Debug.Log($"Client {clientId} denied connection");
@@ -167,10 +167,10 @@ void OnClickedPreload()
             {
                 return;
             }
-            
+
             PreloadPrefabs();
         }
-        
+
         // invoked by UI
         void OnClickedTrySpawnSynchronously()
         {
@@ -178,10 +178,10 @@ void OnClickedTrySpawnSynchronously()
             {
                 return;
             }
-            
+
             TrySpawnSynchronously();
         }
-        
+
         // invoked by UI
         void OnClickedTrySpawnInvisible()
         {
@@ -189,7 +189,7 @@ void OnClickedTrySpawnInvisible()
             {
                 return;
             }
-            
+
             TrySpawnInvisible();
         }
 
@@ -216,47 +216,47 @@ async Task PreloadDynamicPrefabOnServerAndStartLoadingOnAllClients(string guid)
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers");
                     return;
                 }
-                
+
                 // update UI for each client that is requested to load a certain prefab
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
-                    m_InGameUI.ClientLoadedPrefabStatusChanged(client, 
-                        assetGuid.GetHashCode(), 
-                        "Undefined", 
+                    m_InGameUI.ClientLoadedPrefabStatusChanged(client,
+                        assetGuid.GetHashCode(),
+                        "Undefined",
                         InGameUI.LoadStatus.Loading);
                 }
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
 
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
                     m_InGameUI.ClientLoadedPrefabStatusChanged(client,
-                        assetGuid.GetHashCode(), 
-                        loadedGameObject.Result.name, 
+                        assetGuid.GetHashCode(),
+                        loadedGameObject.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
             }
         }
-        
+
         async void TrySpawnSynchronously()
         {
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
             await TrySpawnDynamicPrefabSynchronously(randomPrefab.AssetGUID, Random.insideUnitCircle * 5, Quaternion.identity);
         }
-        
+
         /// <summary>
         /// This call attempts to spawn a prefab by it's addressable guid - it ensures that all the clients have loaded the prefab before spawning it,
         /// and if the clients fail to acknowledge that they've loaded a prefab - the spawn will fail.
@@ -271,33 +271,33 @@ async void TrySpawnSynchronously()
                 {
                     Value = guid
                 };
-                
+
                 if (DynamicPrefabLoadingUtilities.IsPrefabLoadedOnAllClients(assetGuid))
                 {
                     Debug.Log("Prefab is already loaded by all peers, we can spawn it immediately");
                     var obj = Spawn(assetGuid);
                     return (true, obj);
                 }
-                
+
                 m_SynchronousSpawnAckCount = 0;
                 m_SynchronousSpawnTimeoutTimer = 0;
-                
+
                 Debug.Log("Loading dynamic prefab on the clients...");
                 LoadAddressableClientRpc(assetGuid);
-                
+
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
 
                 //load the prefab on the server, so that any late-joiner will need to load that prefab also
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
 
-                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 : 
+                var requiredAcknowledgementsCount = IsHost ? m_NetworkManager.ConnectedClients.Count - 1 :
                     m_NetworkManager.ConnectedClients.Count;
-                
+
                 while (m_SynchronousSpawnTimeoutTimer < m_InGameUI.NetworkSpawnTimeoutSeconds)
                 {
                     if (m_SynchronousSpawnAckCount >= requiredAcknowledgementsCount)
@@ -306,11 +306,11 @@ async void TrySpawnSynchronously()
                         var obj = Spawn(assetGuid);
                         return (true, obj);
                     }
-                    
+
                     m_SynchronousSpawnTimeoutTimer += Time.deltaTime;
                     await Task.Yield();
                 }
-                
+
                 // left to the reader: you'll need to be reactive to clients failing to load -- you should either have
                 // the offending client try again or disconnect it after a predetermined amount of failed attempts
                 Debug.LogError("Failed to spawn dynamic prefab - timeout");
@@ -326,20 +326,20 @@ NetworkObject Spawn(AddressableGUID assetGuid)
                     Debug.LogWarning($"GUID {assetGuid} is not a GUID of a previously loaded prefab. Failed to spawn a prefab.");
                     return null;
                 }
-                
+
                 var obj = Instantiate(prefab.Result, position, rotation).GetComponent<NetworkObject>();
                 obj.Spawn();
                 Debug.Log("Spawned dynamic prefab");
-                
+
                 // every client loaded dynamic prefab, their respective ClientUIs in case they loaded first
                 foreach (var client in m_NetworkManager.ConnectedClients.Keys)
                 {
-                    m_InGameUI.ClientLoadedPrefabStatusChanged(client, 
-                        assetGuid.GetHashCode(), 
-                        prefab.Result.name, 
+                    m_InGameUI.ClientLoadedPrefabStatusChanged(client,
+                        assetGuid.GetHashCode(),
+                        prefab.Result.name,
                         InGameUI.LoadStatus.Loaded);
                 }
-                
+
                 return obj;
             }
         }
@@ -349,7 +349,7 @@ async void TrySpawnInvisible()
             var randomPrefab = m_DynamicPrefabReferences[Random.Range(0, m_DynamicPrefabReferences.Count)];
             await SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(randomPrefab.AssetGUID, Random.insideUnitCircle * 5, Quaternion.identity);
         }
-        
+
         /// <summary>
         /// This call spawns an addressable prefab by it's guid. It does not ensure that all the clients have loaded the
         /// prefab before spawning it. All spawned objects are network-invisible to clients that don't have the prefab
@@ -366,7 +366,7 @@ async Task<NetworkObject> SpawnImmediatelyAndHideUntilPrefabIsLoadedOnClient(str
                 {
                     Value = guid
                 };
-                
+
                 return await Spawn(assetGuid);
             }
 
@@ -377,52 +377,52 @@ async Task<NetworkObject> Spawn(AddressableGUID assetGuid)
                 // server is starting to load a prefab, update UI
                 m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
 
-                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, 
+                var prefab = await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid,
                     m_InGameUI.ArtificialDelayMilliseconds);
-                
+
                 // server loaded a prefab, update UI with the loaded asset's name
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
-                m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);                
-                
+                m_InGameUI.ClientLoadedPrefabStatusChanged(NetworkManager.ServerClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
+
                 var obj = Instantiate(prefab, position, rotation).GetComponent<NetworkObject>();
-                
+
                 if (m_PrefabHashToNetworkObjectId.TryGetValue(assetGuid.GetHashCode(), out var networkObjectIds))
                 {
                     networkObjectIds.Add(obj);
                 }
                 else
                 {
-                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() {obj});
+                    m_PrefabHashToNetworkObjectId.Add(assetGuid.GetHashCode(), new HashSet<NetworkObject>() { obj });
                 }
 
-                obj.CheckObjectVisibility = (clientId) => 
+                obj.CheckObjectVisibility = (clientId) =>
                 {
                     if (clientId == NetworkManager.ServerClientId)
                     {
                         // object is loaded on the server, no need to validate for visibility
                         return true;
                     }
-                    
+
                     //if the client has already loaded the prefab - we can make the object network-visible to them
                     if (DynamicPrefabLoadingUtilities.HasClientLoadedPrefab(clientId, assetGuid.GetHashCode()))
                     {
                         return true;
                     }
-                    
+
                     // client is loading a prefab, update UI
                     m_InGameUI.ClientLoadedPrefabStatusChanged(clientId, assetGuid.GetHashCode(), "Undefined", InGameUI.LoadStatus.Loading);
 
                     //otherwise the client need to load the prefab, and after they ack - the ShowHiddenObjectsToClient 
-                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams(){Send = new ClientRpcSendParams(){TargetClientIds = new ulong[]{clientId}}});
+                    LoadAddressableClientRpc(assetGuid, new ClientRpcParams() { Send = new ClientRpcSendParams() { TargetClientIds = new ulong[] { clientId } } });
                     return false;
                 };
-                
+
                 obj.Spawn();
 
                 return obj;
             }
         }
-        
+
         void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
         {
             if (m_PrefabHashToNetworkObjectId.TryGetValue(prefabHash, out var networkObjects))
@@ -436,7 +436,7 @@ void ShowHiddenObjectsToClient(int prefabHash, ulong clientId)
                 }
             }
         }
-        
+
         [ClientRpc]
         void LoadAddressableClientRpc(AddressableGUID guid, ClientRpcParams rpcParams = default)
         {
@@ -453,22 +453,22 @@ async void Load(AddressableGUID assetGuid)
                 Debug.Log("Loading dynamic prefab on the client...");
                 await DynamicPrefabLoadingUtilities.LoadDynamicPrefab(assetGuid, m_InGameUI.ArtificialDelayMilliseconds);
                 Debug.Log("Client loaded dynamic prefab");
-                
+
                 DynamicPrefabLoadingUtilities.TryGetLoadedGameObjectFromGuid(assetGuid, out var loadedGameObject);
                 m_InGameUI.ClientLoadedPrefabStatusChanged(m_NetworkManager.LocalClientId, assetGuid.GetHashCode(), loadedGameObject.Result.name, InGameUI.LoadStatus.Loaded);
 
                 AcknowledgeSuccessfulPrefabLoadServerRpc(assetGuid.GetHashCode());
             }
         }
-        
+
         [ServerRpc(RequireOwnership = false)]
         void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rpcParams = default)
         {
             m_SynchronousSpawnAckCount++;
             Debug.Log($"Client acknowledged successful prefab load with hash: {prefabHash}");
-            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash, 
+            DynamicPrefabLoadingUtilities.RecordThatClientHasLoadedAPrefab(prefabHash,
                 rpcParams.Receive.SenderClientId);
-           
+
             //the server has all the objects network-visible, no need to do anything
             if (rpcParams.Receive.SenderClientId != m_NetworkManager.LocalClientId)
             {
@@ -488,7 +488,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                 {
                     // found the matching prefab reference
                     if (DynamicPrefabLoadingUtilities.LoadedDynamicPrefabResourceHandles.TryGetValue(
-                            prefabReferenceGuid, 
+                            prefabReferenceGuid,
                             out var loadedGameObject))
                     {
                         // if it is loaded on the server, update the name on the ClientUI
@@ -497,7 +497,7 @@ void AcknowledgeSuccessfulPrefabLoadServerRpc(int prefabHash, ServerRpcParams rp
                     break;
                 }
             }
-            
+
             // client has successfully loaded a prefab, update UI
             m_InGameUI.ClientLoadedPrefabStatusChanged(rpcParams.Receive.SenderClientId, prefabHash, loadedPrefabName, InGameUI.LoadStatus.Loaded);
         }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs
index 0587edb51..6f6b0d960 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Readme/Editor/ReadmeEditor.cs
@@ -78,7 +78,7 @@ static void LoadLayout()
             var assembly = typeof(EditorApplication).Assembly;
             var windowLayoutType = assembly.GetType("UnityEditor.WindowLayout", true);
             var method = windowLayoutType.GetMethod("LoadWindowLayout", BindingFlags.Public | BindingFlags.Static);
-            method?.Invoke(null, new object[] {Path.Combine(Application.dataPath, "TutorialInfo/Layout.wlt"), false});
+            method?.Invoke(null, new object[] { Path.Combine(Application.dataPath, "TutorialInfo/Layout.wlt"), false });
         }
 
         [MenuItem("Sample/Show Sample Instructions")]
@@ -89,9 +89,9 @@ static Readme SelectReadme()
             {
                 var readmeObject = AssetDatabase.LoadMainAssetAtPath(AssetDatabase.GUIDToAssetPath(ids[0]));
 
-                Selection.objects = new UnityEngine.Object[] {readmeObject};
+                Selection.objects = new UnityEngine.Object[] { readmeObject };
 
-                return (Readme) readmeObject;
+                return (Readme)readmeObject;
             }
             else
             {
@@ -102,7 +102,7 @@ static Readme SelectReadme()
 
         protected override void OnHeaderGUI()
         {
-            var readme = (Readme) target;
+            var readme = (Readme)target;
             Init();
 
             var iconWidth = Mathf.Min(EditorGUIUtility.currentViewWidth / 3f - 20f, 128f);
@@ -117,7 +117,7 @@ protected override void OnHeaderGUI()
 
         public override void OnInspectorGUI()
         {
-            var readme = (Readme) target;
+            var readme = (Readme)target;
             Init();
 
             foreach (var section in readme.sections)
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs
index f2c916a72..549166d47 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AddressableGUID.cs
@@ -29,7 +29,7 @@ public override string ToString()
             return Value.ToString();
         }
     }
-    
+
     /// <summary>
     /// A class that implements IEqualityComparer, for AddressableGUID comparisons that don't allocate memory since it
     /// compares integer values instead of strings.
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs
index 10bacf15d..f00373875 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/AppController.cs
@@ -17,10 +17,10 @@ public sealed class AppController : MonoBehaviour
 
         [SerializeField]
         OptionalConnectionManager m_ConnectionManager;
-        
+
         [SerializeField]
         IPMenuUI m_IPMenuUI;
-        
+
         [SerializeField]
         InGameUI m_InGameUI;
 
@@ -33,7 +33,7 @@ void Start()
         {
             m_IPMenuUI.ResetUI();
             m_InGameUI.Hide();
-            
+
             m_NetworkManager.OnClientConnectedCallback += OnClientConnected;
             m_NetworkManager.OnClientDisconnectCallback += OnClientDisconnect;
 
@@ -58,7 +58,7 @@ void OnDestroy()
         void OnClientConnected(ulong clientId)
         {
             m_IPMenuUI.HideIPConnectionMenu();
-            
+
             // for host
             if (m_NetworkManager.IsHost)
             {
@@ -72,7 +72,7 @@ void OnClientConnected(ulong clientId)
                 {
                     // grab all loaded prefabs and represent that on the newly joined client
                     var loadedPrefabs = GetLoadedPrefabsHashesAndNames();
-                    
+
                     m_InGameUI.AddConnectionUIInstance(clientId, loadedPrefabs.Item1, loadedPrefabs.Item2);
                 }
             }
@@ -83,10 +83,10 @@ void OnClientConnected(ulong clientId)
                 {
                     m_IPMenuUI.ClientStarted();
                     m_InGameUI.Show(InGameUI.ButtonVisibility.Client);
-                    
+
                     // grab all locally loaded prefabs and represent that on local client
                     var loadedPrefabs = GetLoadedPrefabsHashesAndNames();
-                    
+
                     m_InGameUI.AddConnectionUIInstance(clientId, loadedPrefabs.Item1, loadedPrefabs.Item2);
                 }
             }
@@ -106,7 +106,7 @@ static Tuple<int[], string[]> GetLoadedPrefabsHashesAndNames()
 
             return Tuple.Create(loadedHashes, loadedNames);
         }
-        
+
         void OnClientDisconnect(ulong clientId)
         {
             // when a connected client disconnects, remove their UI
@@ -123,13 +123,13 @@ void OnClientDisconnect(ulong clientId)
                 m_InGameUI.Hide();
             }
         }
-        
+
         void StartHost()
         {
             Debug.Log(nameof(StartHost));
             m_ConnectionManager.StartHostIp(m_IPMenuUI.IpAddress, m_IPMenuUI.Port);
         }
-        
+
         void StartClient()
         {
             Debug.Log(nameof(StartClient));
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs
index 82cc6d632..91c9d5f1e 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionPayload.cs
@@ -13,7 +13,7 @@ public class ConnectionPayload
     {
         public int hashOfDynamicPrefabGUIDs;
     }
-    
+
     /// <summary>
     /// For the purposes of this sample, this class will be serialized inside of Netcode for GameObject's
     /// DisconnectReason string, and sent to clients which failed to connect. It contains the reason enum, and the list
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs
index ff58a826c..b3c02b211 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionState.cs
@@ -15,13 +15,13 @@ abstract class ConnectionState
         public abstract void Exit();
 
         public virtual void OnClientConnected(ulong clientId) { }
-        
+
         public virtual void OnClientDisconnect(ulong clientId) { }
 
         public virtual void OnServerStarted() { }
 
         public virtual void StartClientIP(string ipaddress, ushort port) { }
-        
+
         public virtual void StartHostIP(string ipaddress, ushort port) { }
 
         public virtual void OnUserRequestedShutdown() { }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs
index c1ee6c6e4..5c5472ad6 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectedState.cs
@@ -12,11 +12,11 @@ public ClientConnectedState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter() { }
 
         public override void Exit() { }
-        
+
         public override void OnUserRequestedShutdown()
         {
             m_ConnectionManager.m_NetworkManager.Shutdown();
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs
index 2448ba137..a1263a18f 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientConnectingState.cs
@@ -14,23 +14,23 @@ public ClientConnectingState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter()
         {
             StartClient();
         }
 
         public override void Exit() { }
-        
+
         void StartClient()
         {
             var transport = m_ConnectionManager.m_NetworkManager.GetComponent<UnityTransport>();
             transport.SetConnectionData(m_ConnectionManager.m_ConnectAddress, m_ConnectionManager.m_Port);
-            m_ConnectionManager.m_NetworkManager.NetworkConfig.ConnectionData = 
+            m_ConnectionManager.m_NetworkManager.NetworkConfig.ConnectionData =
                 DynamicPrefabLoadingUtilities.GenerateRequestPayload();
             m_ConnectionManager.m_NetworkManager.StartClient();
         }
-        
+
         public override void OnClientConnected(ulong _)
         {
             m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientConnected);
@@ -55,11 +55,11 @@ public override void OnClientDisconnect(ulong _)
                         m_ConnectionManager.ChangeState(m_ConnectionManager.m_Offline);
                         break;
                     case DisconnectReason.ClientNeedsToPreload:
-                    {
-                        Debug.Log("Client needs to preload");
-                        m_ConnectionManager.m_ClientPreloading.disconnectionPayload = disconnectionPayload;
-                        m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientPreloading);
-                    }
+                        {
+                            Debug.Log("Client needs to preload");
+                            m_ConnectionManager.m_ClientPreloading.disconnectionPayload = disconnectionPayload;
+                            m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientPreloading);
+                        }
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs
index 56f5b5c46..6f8ed16ee 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/ClientPreloadingState.cs
@@ -23,7 +23,7 @@ public ClientPreloadingState(OptionalConnectionManager connectionManager)
         public override void Enter()
         {
             m_ConnectionManager.m_NetworkManager.Shutdown();
-            HandleDisconnectReason(); 
+            HandleDisconnectReason();
         }
 
         async void HandleDisconnectReason()
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs
index 10c6ba4b1..32b26c49c 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/HostingState.cs
@@ -12,7 +12,7 @@ public HostingState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter() { }
 
         public override void Exit() { }
@@ -27,7 +27,7 @@ public override void OnClientConnected(ulong clientId)
         {
             Debug.Log($"Client {clientId} connected");
         }
-        
+
         public override void OnClientDisconnect(ulong clientId)
         {
             if (clientId == m_ConnectionManager.m_NetworkManager.LocalClientId)
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs
index f43e45c25..91ebd8f93 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/OfflineState.cs
@@ -13,7 +13,7 @@ public OfflineState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-        
+
         public override void Enter()
         {
             DynamicPrefabLoadingUtilities.UnloadAndReleaseAllDynamicPrefabs();
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs
index 985b66804..0b3fa6d6e 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/ConnectionStates/StartingHostState.cs
@@ -13,21 +13,21 @@ public StartingHostState(OptionalConnectionManager connectionManager)
         {
             m_ConnectionManager = connectionManager;
         }
-    
+
         public override void Enter()
         {
             StartHost();
         }
 
         public override void Exit() { }
-        
+
         void StartHost()
         {
             var transport = m_ConnectionManager.m_NetworkManager.GetComponent<UnityTransport>();
             transport.SetConnectionData(m_ConnectionManager.m_ConnectAddress, m_ConnectionManager.m_Port);
             m_ConnectionManager.m_NetworkManager.StartHost();
         }
-        
+
         public override void OnClientDisconnect(ulong clientId)
         {
             if (clientId == m_ConnectionManager.m_NetworkManager.LocalClientId)
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs
index f713ee6bc..0b0380c16 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/DynamicPrefabLoadingUtilities.cs
@@ -22,16 +22,16 @@ public static class DynamicPrefabLoadingUtilities
         public static int HashOfDynamicPrefabGUIDs { get; private set; } = k_EmptyDynamicPrefabHash;
 
         static Dictionary<AddressableGUID, AsyncOperationHandle<GameObject>> s_LoadedDynamicPrefabResourceHandles = new Dictionary<AddressableGUID, AsyncOperationHandle<GameObject>>(new AddressableGUIDEqualityComparer());
-        
+
         static List<AddressableGUID> s_DynamicPrefabGUIDs = new List<AddressableGUID>(); //cached list to avoid GC
 
         //A storage where we keep the association between the dynamic prefab (hash of it's GUID) and the clients that have it loaded
         static Dictionary<int, HashSet<ulong>> s_PrefabHashToClientIds = new Dictionary<int, HashSet<ulong>>();
 
-        public static bool HasClientLoadedPrefab(ulong clientId, int prefabHash) => 
+        public static bool HasClientLoadedPrefab(ulong clientId, int prefabHash) =>
             s_PrefabHashToClientIds.TryGetValue(prefabHash, out var clientIds) && clientIds.Contains(clientId);
 
-        public static bool IsPrefabLoadedOnAllClients(AddressableGUID assetGuid) => 
+        public static bool IsPrefabLoadedOnAllClients(AddressableGUID assetGuid) =>
             s_LoadedDynamicPrefabResourceHandles.ContainsKey(assetGuid);
 
         public static bool TryGetLoadedGameObjectFromGuid(AddressableGUID assetGuid, out AsyncOperationHandle<GameObject> loadedGameObject)
@@ -64,7 +64,7 @@ public static void RecordThatClientHasLoadedAllPrefabs(ulong clientId)
                 RecordThatClientHasLoadedAPrefab(dynamicPrefabGUID.GetHashCode(), clientId);
             }
         }
-        
+
         public static void RecordThatClientHasLoadedAPrefab(int assetGuidHash, ulong clientId)
         {
             if (s_PrefabHashToClientIds.TryGetValue(assetGuidHash, out var clientIds))
@@ -103,17 +103,17 @@ public static string GenerateDisconnectionPayload()
             {
                 dynamicPrefabGuidStrings.Add(dynamicPrefabGuid.ToString());
             }
-            
+
             var rejectionPayload = new DisconnectionPayload()
             {
                 reason = DisconnectReason.ClientNeedsToPreload,
                 guids = dynamicPrefabGuidStrings
             };
-    
+
             return JsonUtility.ToJson(rejectionPayload);
         }
-        
-        public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int artificialDelayMilliseconds, 
+
+        public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int artificialDelayMilliseconds,
             bool recomputeHash = true)
         {
             if (s_LoadedDynamicPrefabResourceHandles.ContainsKey(guid))
@@ -121,7 +121,7 @@ public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int
                 Debug.Log($"Prefab has already been loaded, skipping loading this time | {guid}");
                 return s_LoadedDynamicPrefabResourceHandles[guid].Result;
             }
-            
+
             Debug.Log($"Loading dynamic prefab {guid.Value}");
             var op = Addressables.LoadAssetAsync<GameObject>(guid.ToString());
             var prefab = await op.Task;
@@ -133,7 +133,7 @@ public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int
 
             s_NetworkManager.AddNetworkPrefab(prefab);
             s_LoadedDynamicPrefabResourceHandles.Add(guid, op);
-            
+
             if (recomputeHash)
             {
                 CalculateDynamicPrefabArrayHash();
@@ -141,7 +141,7 @@ public static async Task<GameObject> LoadDynamicPrefab(AddressableGUID guid, int
 
             return prefab;
         }
-        
+
         public static async Task<IList<GameObject>> LoadDynamicPrefabs(AddressableGUID[] guids,
             int artificialDelaySeconds = 0)
         {
@@ -149,12 +149,12 @@ public static async Task<IList<GameObject>> LoadDynamicPrefabs(AddressableGUID[]
 
             foreach (var guid in guids)
             {
-                tasks.Add( LoadDynamicPrefab(guid, artificialDelaySeconds, recomputeHash:false));
+                tasks.Add(LoadDynamicPrefab(guid, artificialDelaySeconds, recomputeHash: false));
             }
-            
+
             var prefabs = await Task.WhenAll(tasks);
             CalculateDynamicPrefabArrayHash();
-            
+
             return prefabs;
         }
 
@@ -163,7 +163,7 @@ public static void RefreshLoadedPrefabGuids()
             s_DynamicPrefabGUIDs.Clear();
             s_DynamicPrefabGUIDs.AddRange(s_LoadedDynamicPrefabResourceHandles.Keys);
         }
-        
+
         static void CalculateDynamicPrefabArrayHash()
         {
             //we need to sort the array so that the hash is consistent across clients
@@ -171,7 +171,7 @@ static void CalculateDynamicPrefabArrayHash()
             RefreshLoadedPrefabGuids();
             s_DynamicPrefabGUIDs.Sort((a, b) => a.Value.CompareTo(b.Value));
             HashOfDynamicPrefabGUIDs = k_EmptyDynamicPrefabHash;
-            
+
             //a simple hash combination algorithm suggested by Jon Skeet,
             //found here: https://stackoverflow.com/questions/1646807/quick-and-simple-hash-code-combinations
             //we can't use C# HashCode combine because it is unreliable across different processes (by design)
@@ -188,17 +188,17 @@ static void CalculateDynamicPrefabArrayHash()
 
             Debug.Log($"Calculated hash of dynamic prefabs: {HashOfDynamicPrefabGUIDs}");
         }
-        
+
         public static void UnloadAndReleaseAllDynamicPrefabs()
         {
             HashOfDynamicPrefabGUIDs = k_EmptyDynamicPrefabHash;
-            
+
             foreach (var handle in s_LoadedDynamicPrefabResourceHandles.Values)
             {
                 s_NetworkManager.RemoveNetworkPrefab(handle.Result);
                 Addressables.Release(handle);
             }
-            
+
             s_LoadedDynamicPrefabResourceHandles.Clear();
         }
     }
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs
index 99d75103c..cd5b2ffca 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/Shared/OptionalConnectionManager.cs
@@ -14,23 +14,23 @@ public class OptionalConnectionManager : MonoBehaviour
     {
         [SerializeField]
         internal NetworkManager m_NetworkManager;
-        
+
         ConnectionState m_CurrentState;
-        
+
         internal OfflineState m_Offline;
-        
+
         internal ClientConnectingState m_ClientConnecting;
-        
+
         internal ClientConnectedState m_ClientConnected;
-        
+
         internal ClientPreloadingState m_ClientPreloading;
-        
+
         internal StartingHostState m_StartingHost;
-        
+
         internal HostingState m_Hosting;
-        
+
         internal string m_ConnectAddress;
-        
+
         internal ushort m_Port;
 
         void Awake()
@@ -46,7 +46,7 @@ void Start()
             m_ClientPreloading = new ClientPreloadingState(this);
             m_StartingHost = new StartingHostState(this);
             m_Hosting = new HostingState(this);
-            
+
             m_CurrentState = m_Offline;
 
             m_NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
@@ -54,7 +54,7 @@ void Start()
             m_NetworkManager.OnServerStarted += OnServerStarted;
             m_NetworkManager.OnTransportFailure += OnTransportFailure;
         }
-        
+
         void OnDestroy()
         {
             m_NetworkManager.OnClientConnectedCallback -= OnClientConnectedCallback;
@@ -62,22 +62,22 @@ void OnDestroy()
             m_NetworkManager.OnServerStarted -= OnServerStarted;
             m_NetworkManager.OnTransportFailure -= OnTransportFailure;
         }
-        
+
         void OnClientConnectedCallback(ulong clientId)
         {
             m_CurrentState.OnClientConnected(clientId);
         }
-        
+
         void OnClientDisconnectCallback(ulong clientId)
         {
             m_CurrentState.OnClientDisconnect(clientId);
         }
-        
+
         void OnServerStarted()
         {
             m_CurrentState.OnServerStarted();
         }
-        
+
         void OnTransportFailure()
         {
             m_CurrentState.OnTransportFailure();
@@ -114,4 +114,4 @@ public void RequestShutdown()
             m_CurrentState.OnUserRequestedShutdown();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs
index 17124cbe7..47c0e0bbb 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/IPMenuUI.cs
@@ -27,11 +27,11 @@ public class IPMenuUI : MonoBehaviour
 
         public string IpAddress { get; private set; } = "127.0.0.1";
         public ushort Port { get; private set; } = 9998;
-                
+
         public event Action HostButtonPressed;
-        
+
         public event Action ClientButtonPressed;
-        
+
         public event Action DisconnectButtonPressed;
 
         void Awake()
@@ -62,17 +62,17 @@ void Start()
             m_IPInputField.value = IpAddress;
             m_PortInputField.value = Port.ToString();
         }
-        
+
         void OnHostButtonPressed()
         {
             HostButtonPressed?.Invoke();
         }
-        
+
         void OnClientButtonPressed()
         {
             ClientButtonPressed?.Invoke();
         }
-        
+
         void OnDisconnectButtonPressed()
         {
             DisconnectButtonPressed?.Invoke();
@@ -87,7 +87,7 @@ public void ClientStarted()
         {
             SwitchToInGameUI("Client");
         }
-        
+
         public void HideIPConnectionMenu()
         {
             SetUIElementVisibility(m_IPMenuUIRoot, false);
diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs
index eaee64b7a..e2236ba77 100644
--- a/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs
+++ b/Basic/DynamicAddressablesNetworkPrefabs/Assets/Scripts/UI/InGameUI.cs
@@ -53,17 +53,17 @@ public class InGameUI : MonoBehaviour
         public float NetworkSpawnTimeoutSeconds { get; private set; } = 3000;
 
         Dictionary<ulong, ClientUI> m_Clients = new Dictionary<ulong, ClientUI>();
-        
+
         public event Action LoadAllAsyncButtonPressed;
-        
+
         public event Action TrySpawnSynchronouslyButtonPressed;
-        
+
         public event Action SpawnUsingVisibilityButtonPressed;
-        
+
         [Flags]
-        public enum ButtonVisibility 
+        public enum ButtonVisibility
         {
-            None   = 0,
+            None = 0,
             Server = 1,
             Client = 2
         }
@@ -165,7 +165,7 @@ void Start()
         public void Show(ButtonVisibility visibility)
         {
             SetUIElementVisibility(m_InGameUIRoot, true);
-            
+
             SetUIElementVisibility(m_ArtificialDelaySliderHolder, m_ShowArtificialDelaySlider.HasFlag(visibility));
             SetUIElementVisibility(m_NetworkSpawnTimeoutSliderHolder, m_ShowNetworkSpawnTimeoutSlider.HasFlag(visibility));
             SetUIElementVisibility(m_ApiControlsHolder, m_ShowApiControls.HasFlag(visibility));
@@ -173,7 +173,7 @@ public void Show(ButtonVisibility visibility)
             SetUIElementVisibility(m_SpawnSynchronouslyButton, m_ShowTrySpawnSynchronouslyButton.HasFlag(visibility));
             SetUIElementVisibility(m_SpawnWithVisibilityButton, m_ShowSpawnUsingVisibilityButton.HasFlag(visibility));
         }
-        
+
         public void Hide()
         {
             SetUIElementVisibility(m_InGameUIRoot, false);
diff --git a/Basic/Invaders/Assets/Scripts/EnemyAgent.cs b/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
index 6f5d7d10f..2cb398f5b 100644
--- a/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
+++ b/Basic/Invaders/Assets/Scripts/EnemyAgent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
@@ -61,7 +61,7 @@ private void Update()
             // Wait for the grace shooting period to pass
             return;
         }
-        
+
         bool bCanShootThisFrame = false;
         if (IsServer && canShoot)
             if (Random.Range(0, 1.0f) > k_ShootingRandomThreshold)
diff --git a/Basic/Invaders/Assets/Scripts/EnemyBullet.cs b/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
index 61059e3e8..672698022 100644
--- a/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
+++ b/Basic/Invaders/Assets/Scripts/EnemyBullet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.Assertions;
diff --git a/Basic/Invaders/Assets/Scripts/InvadersGame.cs b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
index 1bf2ab235..bd38f2d99 100644
--- a/Basic/Invaders/Assets/Scripts/InvadersGame.cs
+++ b/Basic/Invaders/Assets/Scripts/InvadersGame.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using TMPro;
 using Unity.Netcode;
@@ -100,7 +100,7 @@ private void Awake()
     {
         Assert.IsNull(Singleton, $"Multiple instances of {nameof(InvadersGame)} detected. This should not happen.");
         Singleton = this;
-        
+
         OnSingletonReady?.Invoke();
 
         if (IsServer)
@@ -198,7 +198,7 @@ private void OnClientConnected(ulong clientId)
         if (m_ReplicatedTimeSent)
         {
             // Send the RPC only to the newly connected client
-            SetReplicatedTimeRemainingClientRPC(m_TimeRemaining, new ClientRpcParams {Send = new ClientRpcSendParams{TargetClientIds = new List<ulong>() {clientId}}});
+            SetReplicatedTimeRemainingClientRPC(m_TimeRemaining, new ClientRpcParams { Send = new ClientRpcSendParams { TargetClientIds = new List<ulong>() { clientId } } });
         }
     }
 
@@ -320,13 +320,13 @@ private void UpdateEnemies()
             UpdateEnemiesResultFlags enemiesResultFlags = UpdateEnemiesResultFlags.None;
             UpdateShootingEnemies(ref enemiesResultFlags);
 
-            if((enemiesResultFlags & UpdateEnemiesResultFlags.ReachedBottom) != 0)
+            if ((enemiesResultFlags & UpdateEnemiesResultFlags.ReachedBottom) != 0)
             {
                 // Force game end as at least one of the enemies have reached the bottom!
                 SetGameEnd(GameOverReason.EnemiesReachedBottom);
                 return;
             }
-            
+
             // If we didn't find any enemies, then spawn some
             if ((enemiesResultFlags & UpdateEnemiesResultFlags.FoundEnemy) == 0)
             {
@@ -367,14 +367,14 @@ private void UpdateShootingEnemies(ref UpdateEnemiesResultFlags flags)
             {
                 continue;
             }
-            
+
             // If at least one of the enemies reached bottom, return early.
             if (enemy.transform.position.y <= k_BottomBoundaryOffset)
             {
                 flags |= UpdateEnemiesResultFlags.ReachedBottom;
                 return;
             }
-            
+
             if (enemy.score > 100)
                 continue;
 
@@ -435,17 +435,17 @@ public void SetGameEnd(GameOverReason reason)
             BroadcastGameOverClientRpc(reason); // Notify our clients!
             return;
         }
-        
+
         foreach (NetworkClient networkedClient in NetworkManager.Singleton.ConnectedClientsList)
         {
             var playerObject = networkedClient.PlayerObject;
-            if(playerObject == null) continue;
-            
+            if (playerObject == null) continue;
+
             // We should just early out if any of the player's are still alive
             if (playerObject.GetComponent<PlayerControl>().IsAlive)
                 return;
         }
-        
+
         this.isGameOver.Value = true;
     }
 
@@ -466,24 +466,24 @@ public void RegisterSpawnableObject(InvadersObjectType invadersObjectType, GameO
         switch (invadersObjectType)
         {
             case InvadersObjectType.Enemy:
-            {
-                // Don't register if this is a saucer
-                if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
-                    return;
-
-                gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
-                Assert.IsTrue(enemyAgent != null);
-                if (!m_Enemies.Contains(enemyAgent))
-                    m_Enemies.Add(enemyAgent);
-                break;
-            }
+                {
+                    // Don't register if this is a saucer
+                    if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
+                        return;
+
+                    gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
+                    Assert.IsTrue(enemyAgent != null);
+                    if (!m_Enemies.Contains(enemyAgent))
+                        m_Enemies.Add(enemyAgent);
+                    break;
+                }
             case InvadersObjectType.Shield:
-            {
-                gameObject.TryGetComponent<Shield>(out var shield);
-                Assert.IsTrue(shield != null);
-                m_Shields.Add(shield);
-                break;
-            }
+                {
+                    gameObject.TryGetComponent<Shield>(out var shield);
+                    Assert.IsTrue(shield != null);
+                    m_Shields.Add(shield);
+                    break;
+                }
             default:
                 Assert.IsTrue(false);
                 break;
@@ -497,25 +497,25 @@ public void UnregisterSpawnableObject(InvadersObjectType invadersObjectType, Gam
         switch (invadersObjectType)
         {
             case InvadersObjectType.Enemy:
-            {
-                // Don't unregister if this is a saucer
-                if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
-                    return;
-
-                gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
-                Assert.IsTrue(enemyAgent != null);
-                if (m_Enemies.Contains(enemyAgent))
-                    m_Enemies.Remove(enemyAgent);
-                break;
-            }
+                {
+                    // Don't unregister if this is a saucer
+                    if (gameObject.TryGetComponent<SuperEnemyMovement>(out var saucer))
+                        return;
+
+                    gameObject.TryGetComponent<EnemyAgent>(out var enemyAgent);
+                    Assert.IsTrue(enemyAgent != null);
+                    if (m_Enemies.Contains(enemyAgent))
+                        m_Enemies.Remove(enemyAgent);
+                    break;
+                }
             case InvadersObjectType.Shield:
-            {
-                gameObject.TryGetComponent<Shield>(out var shield);
-                Assert.IsTrue(shield != null);
-                if (m_Shields.Contains(shield))
-                    m_Shields.Remove(shield);
-                break;
-            }
+                {
+                    gameObject.TryGetComponent<Shield>(out var shield);
+                    Assert.IsTrue(shield != null);
+                    if (m_Shields.Contains(shield))
+                        m_Shields.Remove(shield);
+                    break;
+                }
             default:
                 Assert.IsTrue(false);
                 break;
diff --git a/Basic/Invaders/Assets/Scripts/LobbyControl.cs b/Basic/Invaders/Assets/Scripts/LobbyControl.cs
index dd4ad8d8a..ebcfae2c9 100644
--- a/Basic/Invaders/Assets/Scripts/LobbyControl.cs
+++ b/Basic/Invaders/Assets/Scripts/LobbyControl.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using TMPro;
 using Unity.Netcode;
@@ -9,11 +9,11 @@ public class LobbyControl : NetworkBehaviour
 {
     [SerializeField]
     private string m_InGameSceneName = "InGame";
-    
+
     // Minimum player count required to transition to next level
     [SerializeField]
     private int m_MinimumPlayerCount = 2;
-    
+
     public TMP_Text LobbyText;
     private bool m_AllPlayersInLobby;
 
@@ -23,7 +23,7 @@ public class LobbyControl : NetworkBehaviour
     public override void OnNetworkSpawn()
     {
         m_ClientsInLobby = new Dictionary<ulong, bool>();
-        
+
         //Always add ourselves to the list at first
         m_ClientsInLobby.Add(NetworkManager.LocalClientId, false);
 
diff --git a/Basic/Invaders/Assets/Scripts/MenuControl.cs b/Basic/Invaders/Assets/Scripts/MenuControl.cs
index a6365363b..d8fe541e4 100644
--- a/Basic/Invaders/Assets/Scripts/MenuControl.cs
+++ b/Basic/Invaders/Assets/Scripts/MenuControl.cs
@@ -42,7 +42,7 @@ public void JoinGame()
             Debug.LogError("Failed to start client.");
         }
     }
-    
+
     static string Sanitize(string dirtyString)
     {
         // sanitize the input for the ip address
diff --git a/Basic/Invaders/Assets/Scripts/PlayerBullet.cs b/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
index 021559c4e..511fd833d 100644
--- a/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
+++ b/Basic/Invaders/Assets/Scripts/PlayerBullet.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Netcode;
 using UnityEngine;
 
@@ -49,11 +49,11 @@ private void OnTriggerEnter2D(Collider2D collider)
 
             // Only the server can despawn a NetworkObject
             hitEnemy.NetworkObject.Despawn();
-            
+
             SpawnExplosionVFXClientRPC(transform.position, Quaternion.identity);
-            
+
             NetworkObject.Despawn();
-            
+
             return;
         }
 
diff --git a/Basic/Invaders/Assets/Scripts/PlayerControl.cs b/Basic/Invaders/Assets/Scripts/PlayerControl.cs
index 0ddd14459..459a907ce 100644
--- a/Basic/Invaders/Assets/Scripts/PlayerControl.cs
+++ b/Basic/Invaders/Assets/Scripts/PlayerControl.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Unity.Mathematics;
 using Unity.Netcode;
 using UnityEngine;
@@ -51,10 +51,10 @@ private void Update()
         switch (SceneTransitionHandler.sceneTransitionHandler.GetCurrentSceneState())
         {
             case SceneTransitionHandler.SceneStates.Ingame:
-            {
-                InGameUpdate();
-                break;
-            }
+                {
+                    InGameUpdate();
+                    break;
+                }
         }
     }
 
@@ -120,7 +120,7 @@ public override void OnNetworkSpawn()
             InvadersGame.OnSingletonReady += SubscribeToDelegatesAndUpdateValues;
         else
             SubscribeToDelegatesAndUpdateValues();
-        
+
         SceneTransitionHandler.sceneTransitionHandler.OnSceneStateChanged += SceneTransitionHandler_sceneStateChanged;
         UpdateColor();
     }
diff --git a/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs b/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs
index 79515437a..57334a489 100644
--- a/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs
+++ b/Basic/Invaders/Assets/Scripts/SceneTransitionHandler.cs
@@ -21,7 +21,7 @@ public class SceneTransitionHandler : NetworkBehaviour
     public event SceneStateChangedDelegateHandler OnSceneStateChanged;
 
     private int m_numberOfClientLoaded;
-    
+
     /// <summary>
     /// Example scene states
     /// </summary>
@@ -42,7 +42,7 @@ public enum SceneStates
     /// </summary>
     private void Awake()
     {
-        if(sceneTransitionHandler != this && sceneTransitionHandler != null)
+        if (sceneTransitionHandler != this && sceneTransitionHandler != null)
         {
             GameObject.Destroy(sceneTransitionHandler.gameObject);
         }
@@ -59,7 +59,7 @@ private void Awake()
     public void SetSceneState(SceneStates sceneState)
     {
         m_SceneState = sceneState;
-        if(OnSceneStateChanged != null)
+        if (OnSceneStateChanged != null)
         {
             OnSceneStateChanged.Invoke(m_SceneState);
         }
@@ -81,7 +81,7 @@ public SceneStates GetCurrentSceneState()
     /// </summary>
     private void Start()
     {
-        if(m_SceneState == SceneStates.Init)
+        if (m_SceneState == SceneStates.Init)
         {
             SceneManager.LoadScene(DefaultMainMenu);
         }
@@ -93,7 +93,7 @@ private void Start()
     public void RegisterCallbacks()
     {
         NetworkManager.Singleton.SceneManager.OnLoadComplete += OnLoadComplete;
-        
+
     }
 
     /// <summary>
@@ -102,7 +102,7 @@ public void RegisterCallbacks()
     /// <param name="scenename"></param>
     public void SwitchScene(string scenename)
     {
-        if(NetworkManager.Singleton.IsListening)
+        if (NetworkManager.Singleton.IsListening)
         {
             m_numberOfClientLoaded = 0;
             NetworkManager.Singleton.SceneManager.LoadScene(scenename, LoadSceneMode.Single);
@@ -134,9 +134,9 @@ public void ExitAndLoadStartMenu()
         {
             NetworkManager.Singleton.SceneManager.OnLoadComplete -= OnLoadComplete;
         }
-        
+
         OnClientLoadedScene = null;
         SetSceneState(SceneStates.Start);
         SceneManager.LoadScene(1);
     }
-}
\ No newline at end of file
+}
diff --git a/Basic/Invaders/Assets/Scripts/Shield.cs b/Basic/Invaders/Assets/Scripts/Shield.cs
index 17b6a02be..7dc32c7b4 100644
--- a/Basic/Invaders/Assets/Scripts/Shield.cs
+++ b/Basic/Invaders/Assets/Scripts/Shield.cs
@@ -1,4 +1,4 @@
-using Unity.Mathematics;
+using Unity.Mathematics;
 using Unity.Netcode;
 using UnityEngine;
 
diff --git a/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs b/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs
index 0bec46745..cc6f97504 100644
--- a/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs
+++ b/Basic/Invaders/Assets/Scripts/SuperEnemyMovement.cs
@@ -1,4 +1,4 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 
 public class SuperEnemyMovement : NetworkBehaviour
@@ -14,7 +14,7 @@ public class SuperEnemyMovement : NetworkBehaviour
     private void Update()
     {
         if (!IsServer) return;
-        
+
         if (transform.position.x > k_YBoundary)
         {
             if (IsServer) NetworkObject.Despawn();
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80f982532..afd0049a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [unreleased] yyyy-mm-dd
+
+### Bitesize Samples Repository
+
+#### Cleanup
+- Formatted .cs files inside the Bitesize Samples repository to adhere to coding standards (#156) Internal testing job definition files were added in order for internal processes to execute.
+
 ## [1.5.0] 2023-12-15
 
 ### Bitesize Samples Repository
diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs
index e24693539..eb00b58fb 100644
--- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/MultiplayerUseCasesUtilities.cs
@@ -37,4 +37,4 @@ public static string FilterBadWords(string input)
                                                                                                  : match.Groups[1].Value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
index 4cccf8045..d54786e32 100644
--- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/NetworkManagerUI.cs
@@ -102,10 +102,10 @@ void SetButtonStateAndColor(Button button, bool highlight, bool enable)
                                              : m_DisabledButtonColor;
             button.colors = colors;
             button.interactable = enable;
-            
+
             var buttonOutline = button.transform.Find("Outline").GetComponent<Image>();
             buttonOutline.color = enable ? m_ButtonOutlineColor : m_ButtonOutlineDisabledColor;
             buttonOutline.color = highlight ? m_ButtonOutlineHighlightedColor : buttonOutline.color;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs
index 22e9066db..0bcc5bd01 100644
--- a/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Common/Scripts/PlayerManager.cs
@@ -68,4 +68,4 @@ void OnLocalPlayerDeSpawned()
 
         void OnNonLocalPlayerDeSpawned() { }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs b/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs
index 6bfffa23a..c23957f1f 100644
--- a/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Editor/Tutorials/TutorialCallbacks.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using UnityEditor;
 using Unity.Tutorials.Core.Editor;
 using Unity.Netcode;
@@ -87,4 +87,4 @@ public void LoadSelectionScene()
             UnityEditor.SceneManagement.EditorSceneManager.OpenScene(AssetDatabase.GetAssetPath(m_UseCaseSelectionScene));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs b/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
index d1aa1572c..57f0c21bb 100644
--- a/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
+++ b/Experimental/MultiplayerUseCases/Assets/StarterAssets/InputSystem/StarterAssetsInputs.cs
@@ -5,76 +5,76 @@
 
 namespace StarterAssets
 {
-	public class StarterAssetsInputs : MonoBehaviour
-	{
-		[Header("Character Input Values")]
-		public Vector2 move;
-		public Vector2 look;
-		public bool jump;
-		public bool sprint;
+    public class StarterAssetsInputs : MonoBehaviour
+    {
+        [Header("Character Input Values")]
+        public Vector2 move;
+        public Vector2 look;
+        public bool jump;
+        public bool sprint;
 
-		[Header("Movement Settings")]
-		public bool analogMovement;
+        [Header("Movement Settings")]
+        public bool analogMovement;
 
-		[Header("Mouse Cursor Settings")]
-		public bool cursorLocked = true;
-		public bool cursorInputForLook = true;
+        [Header("Mouse Cursor Settings")]
+        public bool cursorLocked = true;
+        public bool cursorInputForLook = true;
 
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
-		public void OnMove(InputValue value)
-		{
-			MoveInput(value.Get<Vector2>());
-		}
+        public void OnMove(InputValue value)
+        {
+            MoveInput(value.Get<Vector2>());
+        }
 
-		public void OnLook(InputValue value)
-		{
-			if(cursorInputForLook)
-			{
-				LookInput(value.Get<Vector2>());
-			}
-		}
+        public void OnLook(InputValue value)
+        {
+            if (cursorInputForLook)
+            {
+                LookInput(value.Get<Vector2>());
+            }
+        }
 
-		public void OnJump(InputValue value)
-		{
-			JumpInput(value.isPressed);
-		}
+        public void OnJump(InputValue value)
+        {
+            JumpInput(value.isPressed);
+        }
 
-		public void OnSprint(InputValue value)
-		{
-			SprintInput(value.isPressed);
-		}
+        public void OnSprint(InputValue value)
+        {
+            SprintInput(value.isPressed);
+        }
 #endif
 
 
-		public void MoveInput(Vector2 newMoveDirection)
-		{
-			move = newMoveDirection;
-		} 
+        public void MoveInput(Vector2 newMoveDirection)
+        {
+            move = newMoveDirection;
+        }
 
-		public void LookInput(Vector2 newLookDirection)
-		{
-			look = newLookDirection;
-		}
+        public void LookInput(Vector2 newLookDirection)
+        {
+            look = newLookDirection;
+        }
 
-		public void JumpInput(bool newJumpState)
-		{
-			jump = newJumpState;
-		}
+        public void JumpInput(bool newJumpState)
+        {
+            jump = newJumpState;
+        }
 
-		public void SprintInput(bool newSprintState)
-		{
-			sprint = newSprintState;
-		}
+        public void SprintInput(bool newSprintState)
+        {
+            sprint = newSprintState;
+        }
 
-		private void OnApplicationFocus(bool hasFocus)
-		{
-			SetCursorState(cursorLocked);
-		}
+        private void OnApplicationFocus(bool hasFocus)
+        {
+            SetCursorState(cursorLocked);
+        }
 
-		private void SetCursorState(bool newState)
-		{
-			Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
-		}
-	}
-	
-}
\ No newline at end of file
+        private void SetCursorState(bool newState)
+        {
+            Cursor.lockState = newState ? CursorLockMode.Locked : CursorLockMode.None;
+        }
+    }
+
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
index 7f1b3b172..9e8e5a81f 100644
--- a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
+++ b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/BasicRigidBodyPush.cs
@@ -1,35 +1,35 @@
-using UnityEngine;
+using UnityEngine;
 
 public class BasicRigidBodyPush : MonoBehaviour
 {
-	public LayerMask pushLayers;
-	public bool canPush;
-	[Range(0.5f, 5f)] public float strength = 1.1f;
+    public LayerMask pushLayers;
+    public bool canPush;
+    [Range(0.5f, 5f)] public float strength = 1.1f;
 
-	private void OnControllerColliderHit(ControllerColliderHit hit)
-	{
-		if (canPush) PushRigidBodies(hit);
-	}
+    private void OnControllerColliderHit(ControllerColliderHit hit)
+    {
+        if (canPush) PushRigidBodies(hit);
+    }
 
-	private void PushRigidBodies(ControllerColliderHit hit)
-	{
-		// https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
+    private void PushRigidBodies(ControllerColliderHit hit)
+    {
+        // https://docs.unity3d.com/ScriptReference/CharacterController.OnControllerColliderHit.html
 
-		// make sure we hit a non kinematic rigidbody
-		Rigidbody body = hit.collider.attachedRigidbody;
-		if (body == null || body.isKinematic) return;
+        // make sure we hit a non kinematic rigidbody
+        Rigidbody body = hit.collider.attachedRigidbody;
+        if (body == null || body.isKinematic) return;
 
-		// make sure we only push desired layer(s)
-		var bodyLayerMask = 1 << body.gameObject.layer;
-		if ((bodyLayerMask & pushLayers.value) == 0) return;
+        // make sure we only push desired layer(s)
+        var bodyLayerMask = 1 << body.gameObject.layer;
+        if ((bodyLayerMask & pushLayers.value) == 0) return;
 
-		// We dont want to push objects below us
-		if (hit.moveDirection.y < -0.3f) return;
+        // We dont want to push objects below us
+        if (hit.moveDirection.y < -0.3f) return;
 
-		// Calculate push direction from move direction, horizontal motion only
-		Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
+        // Calculate push direction from move direction, horizontal motion only
+        Vector3 pushDir = new Vector3(hit.moveDirection.x, 0.0f, hit.moveDirection.z);
 
-		// Apply the push and take strength into account
-		body.AddForce(pushDir * strength, ForceMode.Impulse);
-	}
-}
\ No newline at end of file
+        // Apply the push and take strength into account
+        body.AddForce(pushDir * strength, ForceMode.Impulse);
+    }
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
index a340f2873..cf54b3638 100644
--- a/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
+++ b/Experimental/MultiplayerUseCases/Assets/StarterAssets/ThirdPersonController/Scripts/ThirdPersonController.cs
@@ -1,4 +1,4 @@
-using Unity.Netcode;
+using Unity.Netcode;
 using UnityEngine;
 #if ENABLE_INPUT_SYSTEM && STARTER_ASSETS_PACKAGES_CHECKED
 using UnityEngine.InputSystem;
@@ -391,4 +391,4 @@ private void OnLand(AnimationEvent animationEvent)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs
index 59f13e222..ab7823eb4 100644
--- a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/MissingReferencesFinder.cs
@@ -33,7 +33,7 @@ internal static void FindMissingReferencesInAllBuiltScenes()
                 {
                     continue;
                 }
-                
+
                 EditorSceneManager.OpenScene(scene.path);
                 FindMissingReferencesInCurrentScene();
             }
@@ -145,4 +145,4 @@ static string GetFullPath(GameObject go)
                                                : Path.Combine(GetFullPath(go.transform.parent.gameObject), go.name);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs
index b74decde4..9ab9b8433 100644
--- a/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs
+++ b/Experimental/MultiplayerUseCases/Assets/Tests/Editor/ProjectTests.cs
@@ -16,4 +16,4 @@ public void FindMissingReferencesInAssets_NoMissingReferencesFound()
             MissingReferencesFinder.FindMissingReferencesInAssets();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
index 0c63e27bb..6ecf09ac3 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetvarVsRpc/Scripts/ColorManager.cs
@@ -49,7 +49,7 @@ public override void OnNetworkDespawn()
 
         void Update()
         {
-            if (!IsClient) 
+            if (!IsClient)
             {
                 /* note: in this case there's only client-side logic and therefore the scripts returns early.
                  * In a real production scenario, you would have an UpdateManager script running all Updates from a centralized point.
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
index b1969c1c1..e3c861d5e 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/CharacterManager.cs
@@ -99,7 +99,7 @@ void OnServerChangeData()
 
         void OnClientHealthChanged(int previousHealth, int newHealth)
         {
-            m_HealthBarImage.rectTransform.localScale = new Vector3((float) newHealth / 100.0f, 1);//(float)newHealth / 100.0f;
+            m_HealthBarImage.rectTransform.localScale = new Vector3((float)newHealth / 100.0f, 1);//(float)newHealth / 100.0f;
             OnClientUpdateHealthBarColor(newHealth);
             //note: you could use the previousHealth to play an healing/damage animation
         }
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs
index 5a068884b..b812510b3 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/NetworkVariables/Scripts/ColorManager.cs
@@ -65,7 +65,7 @@ void Update()
             m_ElapsedSecondsSinceLastChange += Time.deltaTime;
 
             if (m_ElapsedSecondsSinceLastChange >= m_SecondsBetweenColorChanges)
-            {  
+            {
                 m_ElapsedSecondsSinceLastChange = 0;
                 OnServerChangeColor();
             }
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs
index 96be59f98..c6351a59f 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionElement.cs
@@ -57,4 +57,4 @@ void LoadScene(string sceneName)
             SceneManager.LoadScene(sceneName, LoadSceneMode.Single);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs
index 8c7991330..72f0f64eb 100644
--- a/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs
+++ b/Experimental/MultiplayerUseCases/Assets/UseCaseSamples/SelectionScreen/Scripts/SceneSelectionUI.cs
@@ -46,4 +46,4 @@ static void DestroyAllChildrenOf(Transform t)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/dotnet-tools/.gitignore b/dotnet-tools/.gitignore
new file mode 100644
index 000000000..8afdcb635
--- /dev/null
+++ b/dotnet-tools/.gitignore
@@ -0,0 +1,454 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# Tye
+.tye/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+##
+## Visual studio for Mac
+##
+
+
+# globs
+Makefile.in
+*.userprefs
+*.usertasks
+config.make
+config.status
+aclocal.m4
+install-sh
+autom4te.cache/
+*.tar.gz
+tarballs/
+test-results/
+
+# Mac bundle stuff
+*.dmg
+*.app
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+##
+## Visual Studio Code
+##
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
diff --git a/dotnet-tools/README.md b/dotnet-tools/README.md
new file mode 100644
index 000000000..9fe158433
--- /dev/null
+++ b/dotnet-tools/README.md
@@ -0,0 +1,61 @@
+# .NET Tools for Unity Netcode
+
+## Netcode.Standards
+
+C# coding standards tool for Netcode that relies on `.editorconfig` ruleset and `dotnet format` tool
+
+### How to Install & Uninstall
+
+Build (Pack)
+
+```zsh
+dotnet pack dotnet-tools/netcode.standards
+```
+
+Install
+
+```zsh
+dotnet tool install --global --add-source ./dotnet-tools/netcode.standards netcode.standards
+```
+
+Check
+
+```zsh
+netcode.standards --help
+```
+
+Uninstall
+
+```zsh
+dotnet tool uninstall --global netcode.standards
+```
+
+### How to Use
+
+#### Commands
+
+Check
+
+```zsh
+# check for standards issues without touching files
+netcode.standards --check
+```
+
+Fix
+```zsh
+# try to fix standards issues and save file changes
+netcode.standards --fix
+```
+
+#### Options
+
+Specifying at least one of `--check` or `--fix` is required.
+
+However, you can also specify other options to configure the tool.
+
+|Option|Description|
+|:-|:-|
+|`--project <project>`|Target project folder [default: testproject]|
+|`--pattern <pattern>`|Search pattern string [default: *.sln]|
+|`--verbosity <verbosity>`|Logs verbosity level [default: normal]|
+|`-?`, `-h`, `--help`|Show help and usage information|
diff --git a/dotnet-tools/netcode.standards/Program.cs b/dotnet-tools/netcode.standards/Program.cs
new file mode 100644
index 000000000..2a8ce865a
--- /dev/null
+++ b/dotnet-tools/netcode.standards/Program.cs
@@ -0,0 +1,66 @@
+using System;
+using System.IO;
+using System.Diagnostics;
+
+internal static class Program
+{
+    /// <summary>
+    /// C# coding standards tool for Netcode that relies on `.editorconfig` ruleset and `dotnet format` tool
+    /// </summary>
+    /// <param name="check">Check for standards issues (will not change files)</param>
+    /// <param name="fix">Try to fix standards issues (could change files)</param>
+    /// <param name="project">Target project folder</param>
+    /// <param name="pattern">Search pattern string</param>
+    /// <param name="verbosity">Logs verbosity level</param>
+    private static int Main(
+        bool check = false, bool fix = false,
+        string project = "",
+        string pattern = "*.sln",
+        string verbosity = "normal")
+    {
+        if (check && fix)
+        {
+            Console.WriteLine($"FAILED: Please use --{nameof(check)} or --{nameof(fix)} individually, not both at the same time");
+            return 1;
+        }
+
+        if (!check && !fix)
+        {
+            Console.WriteLine($"FAILED: Please use at least one of --{nameof(check)} or --{nameof(fix)} workflows");
+            return 2;
+        }
+
+        foreach (var file in Directory.GetFiles(project, pattern))
+        {
+            var procInfo = new ProcessStartInfo("dotnet");
+
+            procInfo.Arguments = check
+                ? $"format {file} whitespace --no-restore --verify-no-changes --verbosity {verbosity}"
+                : $"format {file} whitespace --no-restore --verbosity {verbosity}";
+            Console.WriteLine($"######## START -> {(check ? "check" : "fix")} whitespace issues");
+            var whitespace = Process.Start(procInfo);
+            whitespace.WaitForExit();
+            if (whitespace.ExitCode != 0)
+            {
+                Console.WriteLine("######## FAILED -> found whitespace issues (see details above)");
+                return whitespace.ExitCode;
+            }
+            Console.WriteLine("######## SUCCEEDED -> no whitespace issues");
+
+            procInfo.Arguments = check
+                ? $"format {file} style --severity error --no-restore --verify-no-changes --verbosity {verbosity}"
+                : $"format {file} style --severity error --no-restore --verbosity {verbosity}";
+            Console.WriteLine($"######## START -> {(check ? "check" : "fix")} style/naming issues");
+            var style = Process.Start(procInfo);
+            style.WaitForExit();
+            if (style.ExitCode != 0)
+            {
+                Console.WriteLine("######## FAILED -> found style/naming issues (see details above)");
+                return style.ExitCode;
+            }
+            Console.WriteLine("######## SUCCEEDED -> no style/naming issues");
+        }
+
+        return 0;
+    }
+}
diff --git a/dotnet-tools/netcode.standards/netcode.standards.csproj b/dotnet-tools/netcode.standards/netcode.standards.csproj
new file mode 100644
index 000000000..74e37a217
--- /dev/null
+++ b/dotnet-tools/netcode.standards/netcode.standards.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <PackAsTool>true</PackAsTool>
+        <ToolCommandName>netcode.standards</ToolCommandName>
+        <PackageOutputPath>./nupkg</PackageOutputPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
+    </ItemGroup>
+
+</Project>
\ No newline at end of file