diff --git a/Assets/Mirror/Examples/TestNT/Prefabs/Bot.prefab b/Assets/Mirror/Examples/TestNT/Prefabs/Bot.prefab
index 4db98e638..eb637c597 100644
--- a/Assets/Mirror/Examples/TestNT/Prefabs/Bot.prefab
+++ b/Assets/Mirror/Examples/TestNT/Prefabs/Bot.prefab
@@ -13,9 +13,9 @@ GameObject:
   - component: {fileID: 8879100155897503324}
   - component: {fileID: 3417360630707946970}
   - component: {fileID: -6701693856010374478}
-  - component: {fileID: 6545184674585495222}
   - component: {fileID: 4832621091644330542}
   - component: {fileID: 7961362217038480789}
+  - component: {fileID: 6545184674585495222}
   m_Layer: 6
   m_Name: Bot
   m_TagString: Player
@@ -123,6 +123,45 @@ MonoBehaviour:
   compressRotation: 1
   positionPrecision: 0.02
   scalePrecision: 0.02
+--- !u!114 &4832621091644330542
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 629047657802428152}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  nameText: {fileID: 4457544332397682606}
+  playerName: 
+--- !u!114 &7961362217038480789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 629047657802428152}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  NTRCustomSendInterval: {fileID: 0}
+  NetworkTransformReliable: {fileID: -6701693856010374478}
+  clientBufferText: {fileID: 9167280228736349983}
+  serverBufferText: {fileID: 2520575634317220638}
+  snapIntText: {fileID: 1649625818729847816}
+  serverSnapCount: 0
+  clientSnapCount: 0
 --- !u!114 &6545184674585495222
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -158,45 +197,6 @@ MonoBehaviour:
   animRotation: 0
   velocity: {x: 0, y: 0, z: 0}
   direction: {x: 0, y: 0, z: 0}
---- !u!114 &4832621091644330542
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 629047657802428152}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  nameText: {fileID: 4457544332397682606}
-  playerName: 
---- !u!114 &7961362217038480789
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 629047657802428152}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  NTRCustomSendInterval: {fileID: 0}
-  NetworkTransformReliable: {fileID: -6701693856010374478}
-  serverBufferText: {fileID: 2520575634317220638}
-  clientBufferText: {fileID: 9167280228736349983}
-  snapIntText: {fileID: 1649625818729847816}
-  serverSnapCount: 0
-  clientSnapCount: 0
 --- !u!1 &1296439317632248743
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Mirror/Examples/TestNT/Prefabs/BotNinja.prefab b/Assets/Mirror/Examples/TestNT/Prefabs/BotNinja.prefab
index 421d1297d..fed37e162 100644
--- a/Assets/Mirror/Examples/TestNT/Prefabs/BotNinja.prefab
+++ b/Assets/Mirror/Examples/TestNT/Prefabs/BotNinja.prefab
@@ -185,9 +185,9 @@ GameObject:
   - component: {fileID: 6540349725042563762}
   - component: {fileID: 1051586678933553460}
   - component: {fileID: -8317558745108888809}
-  - component: {fileID: 8876085967545516632}
   - component: {fileID: 7128055435883173568}
   - component: {fileID: -5553017530869942022}
+  - component: {fileID: 8876085967545516632}
   m_Layer: 6
   m_Name: BotNinja
   m_TagString: Player
@@ -298,6 +298,45 @@ MonoBehaviour:
   scalePrecision: 0.02
   velocity: {x: 0, y: 0, z: 0}
   angVelocity: {x: 0, y: 0, z: 0}
+--- !u!114 &7128055435883173568
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2972877558187846166}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  nameText: {fileID: 2028725484753263424}
+  playerName: 
+--- !u!114 &-5553017530869942022
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2972877558187846166}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  NTRCustomSendInterval: {fileID: -8317558745108888809}
+  NetworkTransformReliable: {fileID: 0}
+  clientBufferText: {fileID: 6828480870887994353}
+  serverBufferText: {fileID: 216728925590855664}
+  snapIntText: {fileID: 3972102377781729510}
+  serverSnapCount: 0
+  clientSnapCount: 0
 --- !u!114 &8876085967545516632
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -333,45 +372,6 @@ MonoBehaviour:
   animRotation: 0
   velocity: {x: 0, y: 0, z: 0}
   direction: {x: 0, y: 0, z: 0}
---- !u!114 &7128055435883173568
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2972877558187846166}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  nameText: {fileID: 2028725484753263424}
-  playerName: 
---- !u!114 &-5553017530869942022
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2972877558187846166}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  NTRCustomSendInterval: {fileID: -8317558745108888809}
-  NetworkTransformReliable: {fileID: 0}
-  serverBufferText: {fileID: 216728925590855664}
-  clientBufferText: {fileID: 6828480870887994353}
-  snapIntText: {fileID: 3972102377781729510}
-  serverSnapCount: 0
-  clientSnapCount: 0
 --- !u!1 &3460729687495372617
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Mirror/Examples/TestNT/Prefabs/NPC.prefab b/Assets/Mirror/Examples/TestNT/Prefabs/NPC.prefab
index a4fe29c40..345975e64 100644
--- a/Assets/Mirror/Examples/TestNT/Prefabs/NPC.prefab
+++ b/Assets/Mirror/Examples/TestNT/Prefabs/NPC.prefab
@@ -1076,9 +1076,9 @@ GameObject:
   - component: {fileID: 1044772989000519529}
   - component: {fileID: 6497505213013742831}
   - component: {fileID: 6939229781949264814}
-  - component: {fileID: 3427814615500822403}
   - component: {fileID: 3915821277891986203}
   - component: {fileID: -2480596454832827664}
+  - component: {fileID: 3427814615500822403}
   m_Layer: 6
   m_Name: NPC
   m_TagString: Player
@@ -1186,6 +1186,45 @@ MonoBehaviour:
   compressRotation: 1
   positionPrecision: 0.02
   scalePrecision: 0.02
+--- !u!114 &3915821277891986203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9078678990242496461}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  nameText: {fileID: 5231846894102171291}
+  playerName: 
+--- !u!114 &-2480596454832827664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9078678990242496461}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  NTRCustomSendInterval: {fileID: 0}
+  NetworkTransformReliable: {fileID: 6939229781949264814}
+  clientBufferText: {fileID: 756491762232780330}
+  serverBufferText: {fileID: 6322424803937864235}
+  snapIntText: {fileID: 7179727379187289405}
+  serverSnapCount: 0
+  clientSnapCount: 0
 --- !u!114 &3427814615500822403
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1221,42 +1260,3 @@ MonoBehaviour:
   animRotation: 0
   velocity: {x: 0, y: 0, z: 0}
   direction: {x: 0, y: 0, z: 0}
---- !u!114 &3915821277891986203
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9078678990242496461}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  nameText: {fileID: 5231846894102171291}
-  playerName: 
---- !u!114 &-2480596454832827664
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9078678990242496461}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  NTRCustomSendInterval: {fileID: 0}
-  NetworkTransformReliable: {fileID: 6939229781949264814}
-  serverBufferText: {fileID: 6322424803937864235}
-  clientBufferText: {fileID: 756491762232780330}
-  snapIntText: {fileID: 7179727379187289405}
-  serverSnapCount: 0
-  clientSnapCount: 0
diff --git a/Assets/Mirror/Examples/TestNT/Prefabs/NPCNinja.prefab b/Assets/Mirror/Examples/TestNT/Prefabs/NPCNinja.prefab
index dc0007cba..f04ff40b8 100644
--- a/Assets/Mirror/Examples/TestNT/Prefabs/NPCNinja.prefab
+++ b/Assets/Mirror/Examples/TestNT/Prefabs/NPCNinja.prefab
@@ -13,9 +13,9 @@ GameObject:
   - component: {fileID: 8566169657365362765}
   - component: {fileID: 2500944774574351307}
   - component: {fileID: 1164328655264353486}
-  - component: {fileID: 6272645315499712679}
   - component: {fileID: 5677112931370300479}
   - component: {fileID: 776442084943794450}
+  - component: {fileID: 6272645315499712679}
   m_Layer: 6
   m_Name: NPCNinja
   m_TagString: Player
@@ -126,6 +126,45 @@ MonoBehaviour:
   scalePrecision: 0.02
   velocity: {x: 0, y: 0, z: 0}
   angVelocity: {x: 0, y: 0, z: 0}
+--- !u!114 &5677112931370300479
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388172571495221481}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  nameText: {fileID: 3460351738891057599}
+  playerName: 
+--- !u!114 &776442084943794450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 388172571495221481}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  NTRCustomSendInterval: {fileID: 1164328655264353486}
+  NetworkTransformReliable: {fileID: 0}
+  clientBufferText: {fileID: 8278033562638586126}
+  serverBufferText: {fileID: 3396595145500835087}
+  snapIntText: {fileID: 1962837813681175065}
+  serverSnapCount: 0
+  clientSnapCount: 0
 --- !u!114 &6272645315499712679
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -161,45 +200,6 @@ MonoBehaviour:
   animRotation: 0
   velocity: {x: 0, y: 0, z: 0}
   direction: {x: 0, y: 0, z: 0}
---- !u!114 &5677112931370300479
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 388172571495221481}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  nameText: {fileID: 3460351738891057599}
-  playerName: 
---- !u!114 &776442084943794450
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 388172571495221481}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  NTRCustomSendInterval: {fileID: 1164328655264353486}
-  NetworkTransformReliable: {fileID: 0}
-  serverBufferText: {fileID: 8278033562638586126}
-  clientBufferText: {fileID: 3396595145500835087}
-  snapIntText: {fileID: 1962837813681175065}
-  serverSnapCount: 0
-  clientSnapCount: 0
 --- !u!1 &2027785136095808950
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Mirror/Examples/TestNT/Prefabs/Player.prefab b/Assets/Mirror/Examples/TestNT/Prefabs/Player.prefab
index c9003aa11..923678464 100644
--- a/Assets/Mirror/Examples/TestNT/Prefabs/Player.prefab
+++ b/Assets/Mirror/Examples/TestNT/Prefabs/Player.prefab
@@ -358,12 +358,12 @@ GameObject:
   - component: {fileID: 8049206744273277709}
   - component: {fileID: 4314596929967491211}
   - component: {fileID: 7264761320023842541}
-  - component: {fileID: 5645625692974173159}
-  - component: {fileID: 6313073782604029823}
   - component: {fileID: 222851012733586747}
+  - component: {fileID: 6313073782604029823}
+  - component: {fileID: 7156468669696336682}
+  - component: {fileID: 5645625692974173159}
   - component: {fileID: -7969791118079622209}
   - component: {fileID: 3644259943796578628}
-  - component: {fileID: 7156468669696336682}
   m_Layer: 6
   m_Name: Player
   m_TagString: Player
@@ -487,6 +487,60 @@ MonoBehaviour:
   scalePrecision: 0.02
   velocity: {x: 0, y: 0, z: 0}
   angVelocity: {x: 0, y: 0, z: 0}
+--- !u!114 &222851012733586747
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2033010110135952297}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9f5084c19de03654fb27bbb4297419a6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+--- !u!114 &6313073782604029823
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2033010110135952297}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  nameText: {fileID: 2976880021398491903}
+  playerName: 
+--- !u!114 &7156468669696336682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2033010110135952297}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  NTRCustomSendInterval: {fileID: 0}
+  NetworkTransformReliable: {fileID: 7264761320023842541}
+  clientBufferText: {fileID: 7761066253652736590}
+  serverBufferText: {fileID: 3924467337252509263}
+  snapIntText: {fileID: 173605869538251097}
+  serverSnapCount: 0
+  clientSnapCount: 0
 --- !u!114 &5645625692974173159
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -522,38 +576,6 @@ MonoBehaviour:
   animRotation: 0
   velocity: {x: 0, y: 0, z: 0}
   direction: {x: 0, y: 0, z: 0}
---- !u!114 &6313073782604029823
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2033010110135952297}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  nameText: {fileID: 2976880021398491903}
-  playerName: 
---- !u!114 &222851012733586747
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2033010110135952297}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9f5084c19de03654fb27bbb4297419a6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
 --- !u!114 &-7969791118079622209
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -588,28 +610,6 @@ MonoBehaviour:
   showGui: 0
   hotKey: 290
   passwordFile: remote_statistics.txt
---- !u!114 &7156468669696336682
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2033010110135952297}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  NTRCustomSendInterval: {fileID: 0}
-  NetworkTransformReliable: {fileID: 7264761320023842541}
-  serverBufferText: {fileID: 3924467337252509263}
-  clientBufferText: {fileID: 7761066253652736590}
-  snapIntText: {fileID: 173605869538251097}
-  serverSnapCount: 0
-  clientSnapCount: 0
 --- !u!1 &2859268202770656871
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Mirror/Examples/TestNT/Prefabs/PlayerDummy.prefab b/Assets/Mirror/Examples/TestNT/Prefabs/PlayerDummy.prefab
index 1b5e9371c..77a418333 100644
--- a/Assets/Mirror/Examples/TestNT/Prefabs/PlayerDummy.prefab
+++ b/Assets/Mirror/Examples/TestNT/Prefabs/PlayerDummy.prefab
@@ -358,10 +358,10 @@ GameObject:
   - component: {fileID: 6942008995422211540}
   - component: {fileID: 3747832210021373522}
   - component: {fileID: 710479491816145282}
-  - component: {fileID: 4736436755474421054}
+  - component: {fileID: 933871666448110562}
   - component: {fileID: 6376804248856986022}
   - component: {fileID: 2283905045532135906}
-  - component: {fileID: 933871666448110562}
+  - component: {fileID: 4736436755474421054}
   - component: {fileID: -2851850855264704529}
   - component: {fileID: 8740952189063260582}
   m_Layer: 6
@@ -489,6 +489,60 @@ MonoBehaviour:
   scalePrecision: 0.02
   velocity: {x: 0, y: 0, z: 0}
   angVelocity: {x: 0, y: 0, z: 0}
+--- !u!114 &933871666448110562
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428992836745641328}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9f5084c19de03654fb27bbb4297419a6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+--- !u!114 &6376804248856986022
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428992836745641328}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  nameText: {fileID: 2788429790867704870}
+  playerName: 
+--- !u!114 &2283905045532135906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1428992836745641328}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  NTRCustomSendInterval: {fileID: 710479491816145282}
+  NetworkTransformReliable: {fileID: 0}
+  clientBufferText: {fileID: 7230148937361745047}
+  serverBufferText: {fileID: 4149219082608855190}
+  snapIntText: {fileID: 975797997464145792}
+  serverSnapCount: 0
+  clientSnapCount: 0
 --- !u!114 &4736436755474421054
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -524,60 +578,6 @@ MonoBehaviour:
   animRotation: 0
   velocity: {x: 0, y: 0, z: 0}
   direction: {x: 0, y: 0, z: 0}
---- !u!114 &6376804248856986022
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1428992836745641328}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  nameText: {fileID: 2788429790867704870}
-  playerName: 
---- !u!114 &2283905045532135906
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1428992836745641328}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  NTRCustomSendInterval: {fileID: 710479491816145282}
-  NetworkTransformReliable: {fileID: 0}
-  serverBufferText: {fileID: 4149219082608855190}
-  clientBufferText: {fileID: 7230148937361745047}
-  snapIntText: {fileID: 975797997464145792}
-  serverSnapCount: 0
-  clientSnapCount: 0
---- !u!114 &933871666448110562
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1428992836745641328}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9f5084c19de03654fb27bbb4297419a6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
 --- !u!114 &-2851850855264704529
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/Mirror/Examples/TestNT/Prefabs/PlayerNinja.prefab b/Assets/Mirror/Examples/TestNT/Prefabs/PlayerNinja.prefab
index da703d82f..24825fe75 100644
--- a/Assets/Mirror/Examples/TestNT/Prefabs/PlayerNinja.prefab
+++ b/Assets/Mirror/Examples/TestNT/Prefabs/PlayerNinja.prefab
@@ -1077,10 +1077,10 @@ GameObject:
   - component: {fileID: 870325169593434784}
   - component: {fileID: 6359089056421288230}
   - component: {fileID: -609796368898801164}
-  - component: {fileID: 3312899339913779786}
+  - component: {fileID: 6969103901093452950}
   - component: {fileID: 3763894291287854802}
   - component: {fileID: 2003669493997550807}
-  - component: {fileID: 6969103901093452950}
+  - component: {fileID: 3312899339913779786}
   - component: {fileID: 8270051434044166674}
   - component: {fileID: 5851163131829192937}
   m_Layer: 6
@@ -1207,6 +1207,60 @@ MonoBehaviour:
   scalePrecision: 0.02
   velocity: {x: 0, y: 0, z: 0}
   angVelocity: {x: 0, y: 0, z: 0}
+--- !u!114 &6969103901093452950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9193589764031967748}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9f5084c19de03654fb27bbb4297419a6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+--- !u!114 &3763894291287854802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9193589764031967748}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  nameText: {fileID: 5399959272900428626}
+  playerName: 
+--- !u!114 &2003669493997550807
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9193589764031967748}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0.1
+  NTRCustomSendInterval: {fileID: -609796368898801164}
+  NetworkTransformReliable: {fileID: 0}
+  clientBufferText: {fileID: 582189624623541219}
+  serverBufferText: {fileID: 6185131698215946210}
+  snapIntText: {fileID: 7045960077892944116}
+  serverSnapCount: 0
+  clientSnapCount: 0
 --- !u!114 &3312899339913779786
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1242,60 +1296,6 @@ MonoBehaviour:
   animRotation: 0
   velocity: {x: 0, y: 0, z: 0}
   direction: {x: 0, y: 0, z: 0}
---- !u!114 &3763894291287854802
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9193589764031967748}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f36b822e59a38dc42aebb18802dd2c6c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  nameText: {fileID: 5399959272900428626}
-  playerName: 
---- !u!114 &2003669493997550807
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9193589764031967748}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 995b66880233cda49846f5cda46330ba, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
-  NTRCustomSendInterval: {fileID: -609796368898801164}
-  NetworkTransformReliable: {fileID: 0}
-  serverBufferText: {fileID: 582189624623541219}
-  clientBufferText: {fileID: 6185131698215946210}
-  snapIntText: {fileID: 7045960077892944116}
-  serverSnapCount: 0
-  clientSnapCount: 0
---- !u!114 &6969103901093452950
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9193589764031967748}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9f5084c19de03654fb27bbb4297419a6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  syncDirection: 0
-  syncMode: 0
-  syncInterval: 0.1
 --- !u!114 &8270051434044166674
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/Mirror/Examples/TestNT/Scripts/PlayerBuffers.cs b/Assets/Mirror/Examples/TestNT/Scripts/PlayerBuffers.cs
index 04ddccf3c..646a3965e 100644
--- a/Assets/Mirror/Examples/TestNT/Scripts/PlayerBuffers.cs
+++ b/Assets/Mirror/Examples/TestNT/Scripts/PlayerBuffers.cs
@@ -11,8 +11,8 @@ public class PlayerBuffers : NetworkBehaviour
         [Header("Components")]
         public NTRCustomSendInterval NTRCustomSendInterval;
         public NetworkTransformReliable NetworkTransformReliable;
-        public TextMeshPro serverBufferText;
         public TextMeshPro clientBufferText;
+        public TextMeshPro serverBufferText;
         public TextMeshPro snapIntText;
 
         [Header("Diagnostics - Do Not Modify")]
@@ -25,8 +25,8 @@ private void OnValidate()
             NetworkTransformReliable = GetComponent<NetworkTransformReliable>();
 
             // Force overrideColorTags true so we can change the color without tags
-            serverBufferText.overrideColorTags = true;
             clientBufferText.overrideColorTags = true;
+            serverBufferText.overrideColorTags = true;
 
             this.enabled = false;
         }
@@ -44,6 +44,23 @@ public override void OnStopClient()
 
         void Update()
         {
+            /////// Client
+            if (NTRCustomSendInterval)
+                clientSnapCount = NTRCustomSendInterval.clientSnapshots.Count;
+            if (NetworkTransformReliable)
+                clientSnapCount = NetworkTransformReliable.clientSnapshots.Count;
+
+            if (clientSnapCount < 2)
+                clientBufferText.color = Color.black;
+            else if (clientSnapCount < 3)
+                clientBufferText.color = Color.green;
+            else if (clientSnapCount < 4)
+                clientBufferText.color = Color.yellow;
+            else
+                clientBufferText.color = Color.red;
+
+            clientBufferText.text = "C: " + new string('-', clientSnapCount);
+
             /////// Server
             //serverSnapCount = networkTransformReliable.serverSnapshots.Count;
 
@@ -58,23 +75,6 @@ void Update()
 
             //serverBufferText.text = "S: " + new string('-', serverSnapCount);
 
-            /////// Client
-            if (NTRCustomSendInterval)
-                clientSnapCount = NTRCustomSendInterval.clientSnapshots.Count;
-            if (NetworkTransformReliable)
-                clientSnapCount = NetworkTransformReliable.clientSnapshots.Count;
-
-            if (clientSnapCount < 2)
-                clientBufferText.color = Color.gray;
-            else if (clientSnapCount < 3)
-                clientBufferText.color = Color.green;
-            else if (clientSnapCount < 4)
-                clientBufferText.color = Color.yellow;
-            else
-                clientBufferText.color = Color.red;
-
-            clientBufferText.text = "C: " + new string('-', clientSnapCount);
-
             /////// Snap Interpolation
             //snapIntText.text = $"{networkTransformReliable.velocity.magnitude:N2}" +
             //                 $"\n{transform.position}";
@@ -82,8 +82,8 @@ void Update()
 
         void LateUpdate()
         {
-            serverBufferText.transform.forward = mainCamTransform.forward;
             clientBufferText.transform.forward = mainCamTransform.forward;
+            serverBufferText.transform.forward = mainCamTransform.forward;
             snapIntText.transform.forward = mainCamTransform.forward;
         }
     }