diff --git a/Mirror/Weaver/CompilationFinishedHook.cs b/Mirror/Weaver/CompilationFinishedHook.cs
new file mode 100644
index 000000000..101f50006
--- /dev/null
+++ b/Mirror/Weaver/CompilationFinishedHook.cs
@@ -0,0 +1,86 @@
+// https://docs.unity3d.com/Manual/RunningEditorCodeOnLaunch.html
+// https://docs.unity3d.com/ScriptReference/AssemblyReloadEvents.html
+
+using System.IO;
+using Mono.Cecil;
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.Compilation;
+using UnityEditorInternal;
+using System;
+
+namespace Mirror.Weaver
+{
+    // InitializeOnLoad is needed for Unity to call the static constructor on load
+    [InitializeOnLoad]
+    public class CompilationFinishedHook
+    {
+        static CompilationFinishedHook()
+        {
+            //UnityEditor.AssemblyReloadEvents.beforeAssemblyReload += AssemblyReloadEvents_BeforeAssemblyReload;
+
+
+            // assemblyPath: Library/ScriptAssemblies/Assembly-CSharp.dll/
+            // assemblyPath: Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
+
+            CompilationPipeline.assemblyCompilationFinished += (assemblyPath, messages) =>
+            {
+                EditorApplication.LockReloadAssemblies();
+                                 
+                // UnityEngineCoreModule.DLL path:
+                string unityEngineCoreModuleDLL = UnityEditorInternal.InternalEditorUtility.GetEngineCoreModuleAssemblyPath();
+                //Debug.Log("unityEngineCoreModuleDLL=" + unityEngineCoreModuleDLL);
+
+                // outputDirectory is the directory of assemblyPath
+                string outputDirectory = Path.GetDirectoryName(assemblyPath);
+                //Debug.Log("outputDirectory=" + outputDirectory);
+
+                // unity calls it for Library/ScriptAssemblies/Assembly-CSharp-Editor.dll too, but we don't want to (and can't) weave this one
+                bool buildingForEditor = assemblyPath.EndsWith("Editor.dll");
+
+                string mirrorRuntimeDll = FindMirrorRuntime();
+
+                if (!File.Exists(mirrorRuntimeDll))
+                {
+                    Debug.LogError("Could not find Mirror runtime,  make sure the file " + mirrorRuntimeDll + " is in your project");
+                    return;
+                }
+
+                if (assemblyPath == mirrorRuntimeDll)
+                {
+                    Debug.Log("Cannot weave mirror runtime");
+                    return;
+                }
+
+                if (!buildingForEditor)
+                {
+                    Console.WriteLine("Weaving: " + assemblyPath);
+                    // assemblyResolver: unity uses this by default:
+                    //   ICompilationExtension compilationExtension = GetCompilationExtension();
+                    //   IAssemblyResolver assemblyResolver = compilationExtension.GetAssemblyResolver(editor, file, null);
+                    // but Weaver creates it's own if null, which is this one:
+                    IAssemblyResolver assemblyResolver = new DefaultAssemblyResolver();
+                    if (Program.Process(unityEngineCoreModuleDLL, mirrorRuntimeDll, outputDirectory, new string[1] { assemblyPath }, new string[0], assemblyResolver, Debug.LogWarning, Debug.LogError))
+                    {
+                        Console.WriteLine("Weaving succeeded for: " + assemblyPath);
+                    }
+                    else
+                        Debug.LogError("Weaving failed for: " + assemblyPath);
+                }
+
+                EditorApplication.UnlockReloadAssemblies();
+
+            };
+
+        }
+
+        private static string FindMirrorRuntime()
+        {
+            string path = Path.Combine("Assets", "Plugins");
+            path = Path.Combine(path, "Mirror.Runtime.dll");
+
+            return path;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/Mirror/Weaver/Mirror.Weaver.csproj b/Mirror/Weaver/Mirror.Weaver.csproj
index 05c17c856..30a24bf11 100644
--- a/Mirror/Weaver/Mirror.Weaver.csproj
+++ b/Mirror/Weaver/Mirror.Weaver.csproj
@@ -57,6 +57,12 @@
     <Reference Include="Unity.Cecil.Pdb">
       <HintPath>..\External\Unity.Cecil\lib\net35\Unity.Cecil.Pdb.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEditor">
+      <HintPath>..\lib\UnityEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>..\lib\UnityEngine.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -67,11 +73,12 @@
     <Compile Include="UNetBehaviourProcessor.cs" />
     <Compile Include="UNetWeaver.cs" />
     <Compile Include="Helpers.cs" />
+    <Compile Include="CompilationFinishedHook.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   
   <ItemGroup>  
-        <CecilFiles Include="$(TargetDir)Unity.Cecil.*"/>  
+        <CecilFiles Include="$(TargetDir)Unity.Cecil.*" />  
   </ItemGroup>  
   <Target Name="AfterBuild">
     <MakeDir Directories="$(ProjectDir)..\Output\Plugins\Editor" />