diff --git a/Assets/Editor/FilePathChecker.cs b/Assets/Editor/FilePathChecker.cs
new file mode 100644
index 0000000..e19aa6c
--- /dev/null
+++ b/Assets/Editor/FilePathChecker.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEngine;
+
+public sealed class FilePathChecker : EditorWindow
+{
+    public const int MaxPathLen = 255;
+    public const int MaxFileNameLen = 63;
+    private List<string> files;
+    private int curmaxPathLen = 180;
+    private int curmaxFileNameLen = 50;
+    private ConcurrentBag<string> showFiles = new();
+
+    private Vector2 silderPos = Vector2.zero;
+
+    private Tuple<string, bool>[] filters = new Tuple<string, bool>[]
+    {
+        new ("路径长度", false),
+        new ("文件名长度", true),
+        new ("材质", true),
+        new ("模型", false),
+        new ("场景", false),
+        new ("其它",false),
+    };
+
+    [MenuItem("Window/路径检查")]
+    private static void OpenFilePathCheckerWindow()
+    {
+        var wnd = GetWindow<FilePathChecker>();
+        wnd.titleContent = new GUIContent("资源路径检查");
+    }
+
+    private FilePathChecker()
+    {
+        ConcurrentBag<string> fileBag = new ConcurrentBag<string>();
+        Parallel.ForEach(Directory.GetFiles(Application.dataPath, "*.*", SearchOption.AllDirectories), item =>
+        {
+            if (item.EndsWith(".meta"))
+            {
+                return;
+            }
+
+            fileBag.Add("Assets" + item.Replace('\\', '/').Replace(Application.dataPath.Replace('\\', '/'), ""));
+        });
+
+        files = fileBag.ToList();
+        FilterResult();
+    }
+
+    private void FilterResult()
+    {
+        showFiles.Clear();
+        Parallel.ForEach(files, f =>
+        {
+            if (filters[0].Item2 && f.Length > curmaxPathLen || filters[1].Item2 && Path.GetFileNameWithoutExtension(f).Length > curmaxFileNameLen)
+            {
+                if (filters[2].Item2 && f.EndsWith(".mat"))
+                {
+                    showFiles.Add(f);
+                }
+                else if (filters[3].Item2 && (f.ToLower() is string s && (s.EndsWith(".fbx") || s.EndsWith(".obj"))))
+                {
+                    showFiles.Add(f);
+                }
+                else if (filters[4].Item2 && (f.ToLower() is string s1 && (s1.EndsWith(".unity") || s1.EndsWith(".scene"))))
+                {
+                    showFiles.Add(f);
+                }
+                else if (filters[5].Item2)
+                {
+                    showFiles.Add(f);
+                }
+            }
+        });
+    }
+
+    private void OnGUI()
+    {
+        EditorGUILayout.BeginVertical();
+
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.LabelField("路径长度");
+        var _curmaxPathLen = EditorGUILayout.IntSlider(curmaxPathLen, 16, MaxPathLen);
+        if (_curmaxPathLen != curmaxPathLen)
+        {
+            curmaxPathLen = _curmaxPathLen;
+            FilterResult();
+        }
+        EditorGUILayout.EndHorizontal();
+
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.LabelField("文件名长度");
+        var _curmaxFileNameLen = EditorGUILayout.IntSlider(curmaxFileNameLen, 1, MaxFileNameLen);
+        if (_curmaxFileNameLen != curmaxFileNameLen)
+        {
+            curmaxFileNameLen = _curmaxFileNameLen;
+            FilterResult();
+        }
+
+        EditorGUILayout.EndHorizontal();
+        EditorGUILayout.Space();
+        EditorGUILayout.BeginHorizontal();
+
+        for (int i = 0; i < filters.Length; i++)
+        {
+            var filter = filters[i];
+            var v = EditorGUILayout.Toggle(filter.Item1, filter.Item2);
+            if (v != filter.Item2)
+            {
+                filters[i] = new Tuple<string, bool>(filter.Item1, v);
+                FilterResult();
+            }
+        }
+
+        EditorGUILayout.EndHorizontal();
+        EditorGUILayout.Space();
+
+        silderPos = EditorGUILayout.BeginScrollView(silderPos);
+        foreach (var item in showFiles)
+        {
+            FileItem(item);
+        }
+ 
+        EditorGUILayout.EndScrollView();
+
+        EditorGUILayout.EndVertical();
+    }
+
+
+    private void FileItem(string path)
+    {
+        EditorGUILayout.BeginHorizontal();
+        EditorGUILayout.LabelField(path);
+        if (GUILayout.Button("Ping"))
+        {
+            EditorGUIUtility.PingObject(AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(path));
+        }
+        EditorGUILayout.EndHorizontal();
+    }
+}
diff --git a/Assets/Editor/FilePathChecker.cs.meta b/Assets/Editor/FilePathChecker.cs.meta
new file mode 100644
index 0000000..085b4fe
--- /dev/null
+++ b/Assets/Editor/FilePathChecker.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ffd5a5c15c510b34c94f1d0e05debbe7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack.meta b/Assets/Editor/TexturePack.meta
new file mode 100644
index 0000000..0b28336
--- /dev/null
+++ b/Assets/Editor/TexturePack.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6258725997e3ca0418f2644062e6d916
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Docker.cs b/Assets/Editor/TexturePack/Docker.cs
new file mode 100644
index 0000000..d04b36f
--- /dev/null
+++ b/Assets/Editor/TexturePack/Docker.cs
@@ -0,0 +1,159 @@
+#if UNITY_EDITOR
+using System;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+public static class Docker
+{
+
+    #region Reflection Types
+    private class _EditorWindow
+    {
+        private EditorWindow instance;
+        private Type type;
+
+        public _EditorWindow(EditorWindow instance)
+        {
+            this.instance = instance;
+            type = instance.GetType();
+        }
+
+        public object m_Parent
+        {
+            get
+            {
+                var field = type.GetField("m_Parent", BindingFlags.Instance | BindingFlags.NonPublic);
+                return field.GetValue(instance);
+            }
+        }
+    }
+
+    private class _DockArea
+    {
+        private object instance;
+        private Type type;
+
+        public _DockArea(object instance)
+        {
+            this.instance = instance;
+            type = instance.GetType();
+        }
+
+        public object window
+        {
+            get
+            {
+                var property = type.GetProperty("window", BindingFlags.Instance | BindingFlags.Public);
+                return property.GetValue(instance, null);
+            }
+        }
+
+        public object s_OriginalDragSource
+        {
+            set
+            {
+                var field = type.GetField("s_OriginalDragSource", BindingFlags.Static | BindingFlags.NonPublic);
+                field.SetValue(null, value);
+            }
+        }
+    }
+
+    private class _ContainerWindow
+    {
+        private object instance;
+        private Type type;
+
+        public _ContainerWindow(object instance)
+        {
+            this.instance = instance;
+            type = instance.GetType();
+        }
+
+
+        public object rootSplitView
+        {
+            get
+            {
+                var property = type.GetProperty("rootSplitView", BindingFlags.Instance | BindingFlags.Public);
+                return property.GetValue(instance, null);
+            }
+        }
+    }
+
+    private class _SplitView
+    {
+        private object instance;
+        private Type type;
+
+        public _SplitView(object instance)
+        {
+            this.instance = instance;
+            type = instance.GetType();
+        }
+
+        public object DragOver(EditorWindow child, Vector2 screenPoint)
+        {
+            var method = type.GetMethod("DragOver", BindingFlags.Instance | BindingFlags.Public);
+            return method.Invoke(instance, new object[] { child, screenPoint });
+        }
+
+        public void PerformDrop(EditorWindow child, object dropInfo, Vector2 screenPoint)
+        {
+            var method = type.GetMethod("PerformDrop", BindingFlags.Instance | BindingFlags.Public);
+            method.Invoke(instance, new object[] { child, dropInfo, screenPoint });
+        }
+    }
+    #endregion
+
+    public enum DockPosition
+    {
+        Left,
+        Top,
+        Right,
+        Bottom
+    }
+
+    /// <summary>
+    /// Docks the second window to the first window at the given position
+    /// </summary>
+    public static void Dock(this EditorWindow wnd, EditorWindow other, DockPosition position)
+    {
+        var mousePosition = GetFakeMousePosition(wnd, position);
+
+        var parent = new _EditorWindow(wnd);
+        var child = new _EditorWindow(other);
+        var dockArea = new _DockArea(parent.m_Parent);
+        var containerWindow = new _ContainerWindow(dockArea.window);
+        var splitView = new _SplitView(containerWindow.rootSplitView);
+        var dropInfo = splitView.DragOver(other, mousePosition);
+        dockArea.s_OriginalDragSource = child.m_Parent;
+        splitView.PerformDrop(other, dropInfo, mousePosition);
+    }
+
+    private static Vector2 GetFakeMousePosition(EditorWindow wnd, DockPosition position)
+    {
+        Vector2 mousePosition = Vector2.zero;
+
+        // The 20 is required to make the docking work.
+        // Smaller values might not work when faking the mouse position.
+        switch (position)
+        {
+            case DockPosition.Left:
+                mousePosition = new Vector2(20, wnd.position.size.y / 2);
+                break;
+            case DockPosition.Top:
+                mousePosition = new Vector2(wnd.position.size.x / 2, 20);
+                break;
+            case DockPosition.Right:
+                mousePosition = new Vector2(wnd.position.size.x - 20, wnd.position.size.y / 2);
+                break;
+            case DockPosition.Bottom:
+                mousePosition = new Vector2(wnd.position.size.x / 2, wnd.position.size.y - 20);
+                break;
+        }
+
+        return GUIUtility.GUIToScreenPoint(mousePosition);
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Assets/Editor/TexturePack/Docker.cs.meta b/Assets/Editor/TexturePack/Docker.cs.meta
new file mode 100644
index 0000000..b950cc0
--- /dev/null
+++ b/Assets/Editor/TexturePack/Docker.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b25038136cd4d354fa7c02bca38c30dd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources.meta b/Assets/Editor/TexturePack/Resources.meta
new file mode 100644
index 0000000..af0ec66
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5eab531d55428ec4faf2565e8dccc92b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources/25_10_30_084215.asset b/Assets/Editor/TexturePack/Resources/25_10_30_084215.asset
new file mode 100644
index 0000000..43707a3
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_10_30_084215.asset
@@ -0,0 +1,50 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 34bbc4130cb4b964aacff1ffb6ea7dd9, type: 3}
+  m_Name: 25_10_30_084215
+  m_EditorClassIdentifier: 
+  PackType: 1
+  OriginTexture2TextureInfo:
+    m_Keys:
+    - {fileID: 2800000, guid: 07a6d0e57a3ecf045a4c126e11857e16, type: 3}
+    - {fileID: 2800000, guid: 0fe9d9cf76b17d7439a37e14b9efecec, type: 3}
+    - {fileID: 2800000, guid: 3cfd0258a2a2046a3a14bbd0266f5825, type: 3}
+    m_Values:
+    - OriginTexture: {fileID: 2800000, guid: 07a6d0e57a3ecf045a4c126e11857e16, type: 3}
+      ArrayIndex: 0
+      ScaleOffset:
+        x: 0
+        y: 0
+        z: 0
+        w: 0
+    - OriginTexture: {fileID: 2800000, guid: 0fe9d9cf76b17d7439a37e14b9efecec, type: 3}
+      ArrayIndex: 2
+      ScaleOffset:
+        x: 0
+        y: 0
+        z: 0
+        w: 0
+    - OriginTexture: {fileID: 2800000, guid: 3cfd0258a2a2046a3a14bbd0266f5825, type: 3}
+      ArrayIndex: 1
+      ScaleOffset:
+        x: 0
+        y: 0
+        z: 0
+        w: 0
+  Textures:
+  - {fileID: 2800000, guid: 07a6d0e57a3ecf045a4c126e11857e16, type: 3}
+  - {fileID: 2800000, guid: 3cfd0258a2a2046a3a14bbd0266f5825, type: 3}
+  - {fileID: 2800000, guid: 0fe9d9cf76b17d7439a37e14b9efecec, type: 3}
+  TextureAtlas: {fileID: 0}
+  TextureAtlasPath: Assets/Editor/TexturePack/Resources/test.png
+  TextureArray: {fileID: 0}
+  TextureArrayPath: Assets/Editor/TexturePack/Resources/test.png
diff --git a/Assets/Scenes/Garden/GardenScene/LightingData.asset.meta b/Assets/Editor/TexturePack/Resources/25_10_30_084215.asset.meta
similarity index 63%
rename from Assets/Scenes/Garden/GardenScene/LightingData.asset.meta
rename to Assets/Editor/TexturePack/Resources/25_10_30_084215.asset.meta
index fa28ffa..204c5ab 100644
--- a/Assets/Scenes/Garden/GardenScene/LightingData.asset.meta
+++ b/Assets/Editor/TexturePack/Resources/25_10_30_084215.asset.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 4c499845f447c484fb847ad545b279b9
+guid: 2eb1332f37c785c4e95627dc33fa7db2
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 112000000
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_042429.asset b/Assets/Editor/TexturePack/Resources/25_11_05_042429.asset
new file mode 100644
index 0000000..1928b75
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_042429.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 34bbc4130cb4b964aacff1ffb6ea7dd9, type: 3}
+  m_Name: 25_11_05_042429
+  m_EditorClassIdentifier: 
+  PackType: 0
+  OriginTexture2TextureInfo:
+    m_Keys:
+    - {fileID: 2800000, guid: 62a1c70c49ee48949804a1b9704d98f4, type: 3}
+    - {fileID: 2800000, guid: 511247e6f2319624b9f36b17c140f4fb, type: 3}
+    m_Values:
+    - OriginTexture: {fileID: 2800000, guid: 62a1c70c49ee48949804a1b9704d98f4, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0
+        y: 0
+    - OriginTexture: {fileID: 2800000, guid: 511247e6f2319624b9f36b17c140f4fb, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0.5
+        y: 0
+  Textures: []
+  TextureAtlas: {fileID: 0}
+  AtlasScale: 0.5
+  TextureAtlasPath: 
+  TextureArray: {fileID: 0}
+  TextureArrayPath: 
+  IsNormalMap: 0
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_042429.asset.meta b/Assets/Editor/TexturePack/Resources/25_11_05_042429.asset.meta
new file mode 100644
index 0000000..354f7b9
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_042429.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c07cd70a3d89b3489cd8988b2e92709
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_042515.asset b/Assets/Editor/TexturePack/Resources/25_11_05_042515.asset
new file mode 100644
index 0000000..8bb4f32
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_042515.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 34bbc4130cb4b964aacff1ffb6ea7dd9, type: 3}
+  m_Name: 25_11_05_042515
+  m_EditorClassIdentifier: 
+  PackType: 0
+  OriginTexture2TextureInfo:
+    m_Keys:
+    - {fileID: 2800000, guid: 0cdf7154483eb934e8f18f84c31ae2a6, type: 3}
+    - {fileID: 2800000, guid: a5bfb97ceb81b244cb97df741fe3953c, type: 3}
+    m_Values:
+    - OriginTexture: {fileID: 2800000, guid: 0cdf7154483eb934e8f18f84c31ae2a6, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0
+        y: 0
+    - OriginTexture: {fileID: 2800000, guid: a5bfb97ceb81b244cb97df741fe3953c, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0.5
+        y: 0
+  Textures: []
+  TextureAtlas: {fileID: 0}
+  AtlasScale: 0.5
+  TextureAtlasPath: 
+  TextureArray: {fileID: 0}
+  TextureArrayPath: 
+  IsNormalMap: 1
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_042515.asset.meta b/Assets/Editor/TexturePack/Resources/25_11_05_042515.asset.meta
new file mode 100644
index 0000000..6f6cf30
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_042515.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9d6ad6c436222942b84ebc5c42300ef
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_042628.asset b/Assets/Editor/TexturePack/Resources/25_11_05_042628.asset
new file mode 100644
index 0000000..28d2d77
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_042628.asset
@@ -0,0 +1,39 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 34bbc4130cb4b964aacff1ffb6ea7dd9, type: 3}
+  m_Name: 25_11_05_042628
+  m_EditorClassIdentifier: 
+  PackType: 0
+  OriginTexture2TextureInfo:
+    m_Keys:
+    - {fileID: 2800000, guid: facfa14bd567c904583bd41b3fa67655, type: 3}
+    - {fileID: 2800000, guid: f424fe2441e9bbb408f606da9d5ea74c, type: 3}
+    m_Values:
+    - OriginTexture: {fileID: 2800000, guid: facfa14bd567c904583bd41b3fa67655, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0.5
+        y: 0
+    - OriginTexture: {fileID: 2800000, guid: f424fe2441e9bbb408f606da9d5ea74c, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0
+        y: 0
+  Textures:
+  - {fileID: 2800000, guid: f424fe2441e9bbb408f606da9d5ea74c, type: 3}
+  - {fileID: 2800000, guid: facfa14bd567c904583bd41b3fa67655, type: 3}
+  TextureAtlas: {fileID: 2800000, guid: ff4f3681a7495974b9475e47d0559608, type: 3}
+  AtlasScale: 0.5
+  TextureAtlasPath: Assets/mask.png
+  TextureArray: {fileID: 0}
+  TextureArrayPath: 
+  IsNormalMap: 0
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_042628.asset.meta b/Assets/Editor/TexturePack/Resources/25_11_05_042628.asset.meta
new file mode 100644
index 0000000..8fffc49
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_042628.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d74cdc82d14d5d547bdd58c495dd0535
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_102946.asset b/Assets/Editor/TexturePack/Resources/25_11_05_102946.asset
new file mode 100644
index 0000000..3a55be1
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_102946.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 34bbc4130cb4b964aacff1ffb6ea7dd9, type: 3}
+  m_Name: 25_11_05_102946
+  m_EditorClassIdentifier: 
+  PackType: 1
+  OriginTexture2TextureInfo:
+    m_Keys:
+    - {fileID: 2800000, guid: 0cdf7154483eb934e8f18f84c31ae2a6, type: 3}
+    - {fileID: 2800000, guid: a5bfb97ceb81b244cb97df741fe3953c, type: 3}
+    m_Values:
+    - OriginTexture: {fileID: 2800000, guid: 0cdf7154483eb934e8f18f84c31ae2a6, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0
+        y: 0
+    - OriginTexture: {fileID: 2800000, guid: a5bfb97ceb81b244cb97df741fe3953c, type: 3}
+      ArrayIndex: 1
+      Offset:
+        x: 0
+        y: 0
+  Textures: []
+  TextureAtlas: {fileID: 0}
+  AtlasScale: 0.5
+  TextureAtlasPath: 
+  TextureArray: {fileID: 0}
+  TextureArrayPath: 
+  IsNormalMap: 1
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_102946.asset.meta b/Assets/Editor/TexturePack/Resources/25_11_05_102946.asset.meta
new file mode 100644
index 0000000..72fa4b3
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_102946.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: be0526f343db1e14da67810237489026
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_110641.asset b/Assets/Editor/TexturePack/Resources/25_11_05_110641.asset
new file mode 100644
index 0000000..e6da0e5
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_110641.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 34bbc4130cb4b964aacff1ffb6ea7dd9, type: 3}
+  m_Name: 25_11_05_110641
+  m_EditorClassIdentifier: 
+  PackType: 1
+  OriginTexture2TextureInfo:
+    m_Keys:
+    - {fileID: 2800000, guid: 62a1c70c49ee48949804a1b9704d98f4, type: 3}
+    - {fileID: 2800000, guid: 511247e6f2319624b9f36b17c140f4fb, type: 3}
+    m_Values:
+    - OriginTexture: {fileID: 2800000, guid: 62a1c70c49ee48949804a1b9704d98f4, type: 3}
+      ArrayIndex: 0
+      Offset:
+        x: 0
+        y: 0
+    - OriginTexture: {fileID: 2800000, guid: 511247e6f2319624b9f36b17c140f4fb, type: 3}
+      ArrayIndex: 1
+      Offset:
+        x: 0
+        y: 0
+  Textures: []
+  TextureAtlas: {fileID: 0}
+  AtlasScale: 0
+  TextureAtlasPath: 
+  TextureArray: {fileID: 0}
+  TextureArrayPath: 
+  IsNormalMap: 0
diff --git a/Assets/Editor/TexturePack/Resources/25_11_05_110641.asset.meta b/Assets/Editor/TexturePack/Resources/25_11_05_110641.asset.meta
new file mode 100644
index 0000000..33bdaf0
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/25_11_05_110641.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec48692bce2cb484ea1c3dd477b35bd1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/Resources/texture_map_index.asset b/Assets/Editor/TexturePack/Resources/texture_map_index.asset
new file mode 100644
index 0000000..64f9cee
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/texture_map_index.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 139452af06b79914f9cc56d83913a7e2, type: 3}
+  m_Name: texture_map_index
+  m_EditorClassIdentifier: 
+  ResultGuid2TextureMap:
+    m_Keys: []
+    m_Values: []
+  TextureGuid2TextureMap:
+    m_Keys: []
+    m_Values: []
+  TextureMap2TextureGuid:
+    m_Keys: []
+    m_Values: []
diff --git a/Assets/Editor/TexturePack/Resources/texture_map_index.asset.meta b/Assets/Editor/TexturePack/Resources/texture_map_index.asset.meta
new file mode 100644
index 0000000..272f4e3
--- /dev/null
+++ b/Assets/Editor/TexturePack/Resources/texture_map_index.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 53d1cbf3326c0b34d8f7ecf86e03738f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/TextureMapIndex.cs b/Assets/Editor/TexturePack/TextureMapIndex.cs
new file mode 100644
index 0000000..4f18a99
--- /dev/null
+++ b/Assets/Editor/TexturePack/TextureMapIndex.cs
@@ -0,0 +1,38 @@
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace TexturePacker
+{
+    internal class TextureMapIndex : ScriptableObject
+    {
+        public SerializedDictionary<string, TextureMapInfo> ResultGuid2TextureMap;
+        public SerializedDictionary<string, TextureMapInfo> TextureGuid2TextureMap;
+        public SerializedDictionary<TextureMapInfo, string> TextureMap2TextureGuid;
+
+        public static readonly string TextureMapIndexPath = $"{TextureMapInfo.TextureMapDir}/texture_map_index.asset";
+
+        private static TextureMapIndex instance;
+
+        public static TextureMapIndex Instance
+        {
+            get
+            {
+                if(instance == null)
+                {
+                    if(File.Exists(TextureMapIndexPath))
+                    {
+                        instance = AssetDatabase.LoadAssetAtPath<TextureMapIndex>(TextureMapIndexPath);
+                    }
+                    else
+                    {
+                        instance = ScriptableObject.CreateInstance<TextureMapIndex>();
+                        AssetDatabase.CreateAsset(instance, TextureMapIndexPath);
+                    }
+                }
+                return instance;
+            } 
+        }
+    }
+}
diff --git a/Assets/Editor/TexturePack/TextureMapIndex.cs.meta b/Assets/Editor/TexturePack/TextureMapIndex.cs.meta
new file mode 100644
index 0000000..2381cda
--- /dev/null
+++ b/Assets/Editor/TexturePack/TextureMapIndex.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 139452af06b79914f9cc56d83913a7e2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/TextureMapInfo.cs b/Assets/Editor/TexturePack/TextureMapInfo.cs
new file mode 100644
index 0000000..fb4e5e3
--- /dev/null
+++ b/Assets/Editor/TexturePack/TextureMapInfo.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Unity.Mathematics;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace TexturePacker
+{
+    public sealed class TextureMapInfo : ScriptableObject
+    {
+        public const string TextureMapDir = "Assets/Editor/TexturePack/Resources";
+
+        [Serializable]
+        public struct TextureInfo
+        {
+            public Texture2D OriginTexture;
+            public int ArrayIndex;
+            public float2 Offset;
+        }
+
+        [Serializable]
+        public enum EPackType
+        {
+            Atlas,
+            Array
+        }
+
+        public EPackType PackType = EPackType.Atlas;
+        public SerializedDictionary<Texture2D, TextureInfo> OriginTexture2TextureInfo = new();
+        public List<Texture2D> Textures;
+        public Texture2D TextureAtlas;
+        public float AtlasScale;
+        public string TextureAtlasPath;
+        public Texture2DArray TextureArray;
+        public string TextureArrayPath;
+        public bool IsNormalMap;
+
+        [ContextMenu("Test")]
+        private void Test()
+        {
+            Texture2D offsetTex = new Texture2D(Textures.Count, 1, TextureFormat.RG16, false);
+            for (int i = 0; i < Textures.Count; i++)
+            {
+                var tex = Textures[i];
+                var info = OriginTexture2TextureInfo[tex];
+                offsetTex.SetPixel(i, 0, new Color(info.Offset.x, info.Offset.y, 0));
+            }
+
+            var path = EditorUtility.SaveFilePanelInProject("保存offset图", "OffsetMap", "png", "");
+            File.WriteAllBytes(path, offsetTex.EncodeToPNG());
+        }
+    }
+
+}
diff --git a/Assets/Editor/TexturePack/TextureMapInfo.cs.meta b/Assets/Editor/TexturePack/TextureMapInfo.cs.meta
new file mode 100644
index 0000000..859372d
--- /dev/null
+++ b/Assets/Editor/TexturePack/TextureMapInfo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 34bbc4130cb4b964aacff1ffb6ea7dd9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/TexturePackerEditor.cs b/Assets/Editor/TexturePack/TexturePackerEditor.cs
new file mode 100644
index 0000000..d97c786
--- /dev/null
+++ b/Assets/Editor/TexturePack/TexturePackerEditor.cs
@@ -0,0 +1,735 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using TexturePacker;
+using Unity.Mathematics;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Experimental.Rendering;
+using UnityEngine.Rendering;
+using UnityEngine.UIElements;
+
+public sealed class TexturePackerEditor : EditorWindow
+{
+    [SerializeField]
+    private VisualTreeAsset m_VisualTreeAsset = default;
+    private TextureMapInfo textureMapInfo;
+
+    private Texture2D textureAtlas;
+    private Texture2DArray textureArray;
+
+    private IMGUIContainer imageListContainer;
+    private List<Texture2D> selectedTexs = new();
+    private List<Rect> texRects = new();
+
+    private Vector2 cellSize = new Vector2(100, 100);
+    private const int MaxArraySize = 255;
+
+    private int selectIndex = -1;
+    private int selectIndexForMove = -1;
+    private Vector2 toolbarOffset = new Vector2(0, 35);
+
+    private int atlasPadding = 0;
+    private static Func<UnityEngine.Object, bool, EditorWindow> fnOpenPropertyEditor;
+    private int textureSize = 512;
+    private EditorWindow atlasPropertiesWindow = null;
+    private EditorWindow arrayPropertiesWindow = null;
+    private Label imgCntLabel = null;
+    private Label infoLabel = null;
+    private GraphicsFormat graphicsFormat = GraphicsFormat.R32G32B32A32_SFloat;
+
+    public enum ETextureSize
+    {
+        _128 = 1 << 7,
+        _256 = 1 << 8,
+        _512 = 1 << 9,
+        _1024 = 1 << 10,
+    }
+
+    static TexturePackerEditor()
+    {
+        var editorCore = AppDomain.CurrentDomain.GetAssemblies().Where(a => a.GetName().Name.Equals("UnityEditor.CoreModule")).FirstOrDefault();
+        var type = editorCore.GetType("UnityEditor.PropertyEditor");
+        var methodInfo = type.GetMethod("OpenPropertyEditor", BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance, null, new Type[] { typeof(UnityEngine.Object), typeof(bool) }, null);
+        fnOpenPropertyEditor = methodInfo.CreateDelegate(typeof(Func<UnityEngine.Object, bool, EditorWindow>)) as Func<UnityEngine.Object, bool, EditorWindow>;
+    }
+
+    [MenuItem("Tools/Performance/TexturePackerEditor")]
+    public static void OpenTexturePackerEditor()
+    {
+        TexturePackerEditor wnd = GetWindow<TexturePackerEditor>();
+        wnd.titleContent = new GUIContent("TexturePackerEditor");
+    }
+
+    [UnityEditor.Callbacks.OnOpenAsset(0)]
+    private static bool OnOpenTextureMapInfo(int instanceID, int line)
+    {
+        var textureMapInfo = EditorUtility.InstanceIDToObject(instanceID) as TextureMapInfo;
+        if(!textureMapInfo)
+        {
+            return false;
+        }
+
+        TexturePackerEditor wnd = GetWindow<TexturePackerEditor>();
+        wnd.titleContent = new GUIContent("TexturePackerEditor");
+        wnd.InitWithTextureMapInfo(textureMapInfo);
+        EditorApplication.delayCall += () =>
+        {
+            wnd.UpdateResult();
+        };
+        return false;
+    }
+
+    private static readonly Color btNormalColor = ColorUtils.ToRGBA(0xFF585858);
+    private static readonly Color btClikedColor = ColorUtils.ToRGBA(0xFF46607C);
+
+    public void CreateGUI()
+    {
+        // Each editor window contains a root VisualElement object
+        VisualElement root = rootVisualElement;
+
+        // Instantiate UXML
+        VisualElement labelFromUXML = m_VisualTreeAsset.Instantiate();
+        root.Add(labelFromUXML);
+        var btArray = root.Q<Button>("btArray");
+        var btAtlas = root.Q<Button>("btAtlas");
+        var btSave = root.Q<Button>("btSave");
+        infoLabel = root.Q<Label>("infoLabel");
+
+        var slAtlasPadding = root.Q<SliderInt>("slAtlasPadding");
+        var textureSizeEnum = root.Q<EnumField>("textureSizeEnum");
+        imgCntLabel = root.Q<Label>("imgCntLabel");
+        root.Q<Toggle>("tgIsNormal").RegisterValueChangedCallback(b =>
+        {
+            textureMapInfo.IsNormalMap = b.newValue;
+            SetNormalOriginTextureFormat(!textureMapInfo.IsNormalMap);
+            UpdateResult();
+        });
+
+        textureSizeEnum.RegisterCallback<ChangeEvent<Enum>>((e) =>
+        {
+            var newTextureSize = (int)(ETextureSize)e.newValue;
+            if(textureSize != newTextureSize)
+            {
+                textureSize = newTextureSize;
+                UpdateResult();
+            }
+        });
+
+        btArray.clicked += () =>
+        {
+            btArray.style.backgroundColor = btClikedColor;
+            btAtlas.style.backgroundColor = btNormalColor;
+            textureMapInfo.PackType = TextureMapInfo.EPackType.Array;
+            slAtlasPadding.visible = false;
+            UpdateResult();
+        };
+
+        btAtlas.clicked += () =>
+        {
+            btAtlas.style.backgroundColor = btClikedColor;
+            btArray.style.backgroundColor = btNormalColor;
+            textureMapInfo.PackType = TextureMapInfo.EPackType.Atlas;
+            slAtlasPadding.visible = true;
+            UpdateResult();
+        };
+
+
+        btSave.clicked += Save;
+
+        btAtlas.style.backgroundColor = btClikedColor;
+
+        slAtlasPadding.RegisterCallback<ChangeEvent<int>>((i) =>
+        {
+            atlasPadding = i.newValue;
+            UpdateResult();
+        });
+
+        imageListContainer = root.Q<IMGUIContainer>("imgList");
+        imageListContainer.onGUIHandler = OnImageListGUI;
+        imageListContainer.RegisterCallback<MouseDownEvent>((e) =>
+        {
+            var mousePos = Event.current.mousePosition - toolbarOffset;
+            for (int i = 0; i < texRects.Count; i++)
+            {
+                if (texRects[i].Contains(mousePos))
+                {
+                    selectIndexForMove = i;
+                    break;
+                }
+            }
+        });
+
+        imageListContainer.RegisterCallback<MouseUpEvent>((e) =>
+        {
+            var swpaIndex = -1;
+            var mousePos = Event.current.mousePosition - toolbarOffset;
+            for (int i = 0; i < texRects.Count; i++)
+            {
+                if (texRects[i].Contains(mousePos))
+                {
+                    swpaIndex = i;
+                    break;
+                }
+            }
+
+            if (swpaIndex != -1 && selectIndexForMove != -1)
+            {
+                if (selectIndexForMove != swpaIndex)
+                {
+                    (selectedTexs[selectIndexForMove], selectedTexs[swpaIndex]) = (selectedTexs[swpaIndex], selectedTexs[selectIndexForMove]);
+                    (texRects[selectIndexForMove], texRects[swpaIndex]) = (texRects[swpaIndex], texRects[selectIndexForMove]);
+                    UpdateResult();
+                }
+            }
+            selectIndexForMove = -1;
+        });
+    }
+
+    private void SetNormalOriginTextureFormat(bool toNormal)
+    {
+        foreach (var item in selectedTexs)
+        {
+            var ti = TextureImporter.GetAtPath(AssetDatabase.GetAssetPath(item)) as TextureImporter;
+            if(toNormal)
+            {
+                ti.textureType = TextureImporterType.NormalMap;
+            }
+            else if (ti.textureType == TextureImporterType.NormalMap)
+            {
+                ti.textureType = TextureImporterType.Default;
+                ti.sRGBTexture = false;
+            }
+            ti.SaveAndReimport();
+        }
+    }
+
+    private void OnImageListGUI()
+    {
+        float windowWidth = position.width;
+        int dynamicColumns = Mathf.FloorToInt(windowWidth / (cellSize.x + 5));
+
+        int count = selectedTexs.Count;
+        int currentColumn = 0;
+        int currentRow = 0;
+
+        var bkColor = GUI.backgroundColor;
+
+        for (int i = 0; i < count; i++)
+        {
+            if (currentColumn == 0)
+            {
+                GUILayout.BeginHorizontal();
+            }
+
+            var rect = EditorGUILayout.GetControlRect(GUILayout.Width(cellSize.x), GUILayout.Height(cellSize.y));
+            texRects[i] = rect;
+
+            if (i == selectIndex || selectIndexForMove != -1 && rect.Contains(Event.current.mousePosition - toolbarOffset))
+            {
+                GUI.backgroundColor = Color.blue;
+            }
+            else
+            {
+                GUI.backgroundColor = bkColor;
+            }
+
+            // insert ?
+            //EditorGUI.DrawRect
+    
+            if (GUI.Button(rect, selectedTexs[i]))
+            {
+                if (selectIndex == i)
+                {
+                    EditorGUIUtility.PingObject(selectedTexs[i]);
+                }
+                selectIndex = i;
+            }
+
+            currentColumn++;
+            if (currentColumn >= dynamicColumns)
+            {
+                GUILayout.EndHorizontal();
+                currentRow++;
+                currentColumn = 0;
+            }
+        }
+        GUI.backgroundColor = bkColor;
+        if (selectIndexForMove != -1)
+        {
+            GUI.Button(new Rect(Event.current.mousePosition, cellSize), selectedTexs[selectIndexForMove]);
+        }
+        if (selectIndex != -1)
+        {
+            infoLabel.visible = true;
+            var tex = selectedTexs[selectIndex];
+            var tinfo = textureMapInfo.OriginTexture2TextureInfo[tex];
+            if (textureMapInfo.PackType == TextureMapInfo.EPackType.Array)
+            {
+                infoLabel.text = $"{tex.name} array index:{tinfo.ArrayIndex}";
+            }
+            else
+            {
+                infoLabel.text = $"{tex.name} atlas offset:{tinfo.Offset}";
+            }
+        }
+        else
+        {
+            infoLabel.visible = false;
+        }
+        if (currentColumn != 0)
+        {
+            GUILayout.EndHorizontal();
+        }
+    }
+
+    private void InitWithTextureMapInfo(TextureMapInfo textureMapInfo)
+    {
+        this.textureMapInfo = textureMapInfo;
+        VisualElement root = rootVisualElement;
+        var btArray = root.Q<Button>("btArray");
+        var btAtlas = root.Q<Button>("btAtlas");
+        var slAtlasPadding = root.Q<SliderInt>("slAtlasPadding");
+        if (textureMapInfo.PackType == TextureMapInfo.EPackType.Atlas)
+        {
+            btArray.style.backgroundColor = btNormalColor;
+            btAtlas.style.backgroundColor = btClikedColor;
+            slAtlasPadding.visible = true;
+        }
+        else
+        {
+            btArray.style.backgroundColor = btClikedColor;
+            btAtlas.style.backgroundColor = btNormalColor;
+            slAtlasPadding.visible = false;
+        }
+
+        if(textureMapInfo.IsNormalMap)
+        {
+            root.Q<Toggle>("tgIsNormal").value = true;
+            SetNormalOriginTextureFormat(!textureMapInfo.IsNormalMap);
+        }    
+
+        selectedTexs = textureMapInfo.Textures;
+        texRects = new List<Rect>(new Rect[selectedTexs.Count]);
+    }
+
+    private void OnGUI()
+    {
+        if (textureMapInfo == null)
+        {
+            textureMapInfo = ScriptableObject.CreateInstance<TextureMapInfo>();
+        }
+
+        switch (Event.current.type)
+        {
+            case EventType.MouseDrag:
+                break;
+            case EventType.MouseDown:
+                selectIndex = -1;
+                Repaint();
+                break;
+            case EventType.KeyDown:
+                break;
+            case EventType.KeyUp:
+                if (Event.current.modifiers == EventModifiers.Control && Event.current.keyCode == KeyCode.S)
+                {
+                    Save();
+                }
+
+                if (Event.current.keyCode == KeyCode.Delete)
+                {
+                    if (selectIndex != -1)
+                    {
+                        RmTexture(selectedTexs[selectIndex]);
+                        selectIndex = -1;
+                    }
+                }
+                break;
+            case EventType.DragUpdated:
+                {
+
+                    for (var i = 0; i < DragAndDrop.objectReferences.Length; i++)
+                    {
+                        if (DragAndDrop.objectReferences[i] is Texture)
+                        {
+                            DragAndDrop.visualMode = DragAndDropVisualMode.Generic;
+                            break;
+                        }
+                    }
+                    break;
+                }
+            case EventType.DragExited:
+                {
+                    for (var i = 0; i < DragAndDrop.objectReferences.Length; i++)
+                    {
+                        var tex = DragAndDrop.objectReferences[i] as Texture2D;
+                        if (tex)
+                        {
+                            AddTexture(tex);
+                        }
+                    }
+                }
+                break;
+            case EventType.ContextClick:
+                break;
+            case EventType.MouseEnterWindow:
+                break;
+            case EventType.MouseLeaveWindow:
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void UpdateResult(Texture2D result, int cellCnt)
+    {
+        result.Apply();
+        var scale = (float)textureSize / result.width;
+        for (int i = 0; i < selectedTexs.Count; i++)
+        {
+            var tex = selectedTexs[i];
+            if (tex.width != textureSize)
+            {
+                Debug.LogWarning($"{tex.name} 尺寸错误: {tex.width} 正确值: {textureSize}");
+            }
+            int cellx = i % cellCnt;
+            int celly = i / cellCnt;
+            var mip = 0;
+            if (tex.width > textureSize)
+            {
+                mip = (int)Mathf.Log(2, tex.width / textureSize);
+            }
+            {
+                var temp = new Texture2D(textureSize, textureSize, graphicsFormat, 0, TextureCreationFlags.None);
+                Graphics.ConvertTexture(tex, temp);
+
+                var offsetx = cellx * (textureSize + atlasPadding);
+                var offsety = celly * (textureSize + atlasPadding);
+
+                Graphics.CopyTexture(temp, 0, 0, 0, 0, textureSize, textureSize, result, 0, 0, offsetx, offsety);
+                GameObject.DestroyImmediate(temp);
+                textureMapInfo.AtlasScale = scale;
+                textureMapInfo.OriginTexture2TextureInfo[tex] = new TextureMapInfo.TextureInfo()
+                {
+                    OriginTexture = tex,
+                    Offset = new float2((float)offsetx / result.width, (float)offsety / result.height),
+                };
+            }
+        }
+    }
+
+    private void UpdateResult(Texture2DArray result)
+    {
+        for (int i = 0; i < selectedTexs.Count; i++)
+        {
+            var tex = selectedTexs[i];
+            if (tex.width != textureSize)
+            {
+                Debug.LogWarning($"{tex.name} 尺寸错误: {tex.width} 正确值: {textureSize}");
+            }
+   
+            Graphics.ConvertTexture(tex, 0, result, i);
+            textureMapInfo.OriginTexture2TextureInfo[tex] = new TextureMapInfo.TextureInfo()
+            {
+                OriginTexture = tex,
+                ArrayIndex = i,
+            };
+        }
+    }
+
+    private void UpdateResult()
+    {
+        if(selectedTexs.Count < 2)
+        {
+            return;
+        }
+
+        if (textureMapInfo.PackType == TextureMapInfo.EPackType.Atlas)
+        {
+            arrayPropertiesWindow?.Close();
+            arrayPropertiesWindow = null;
+
+            var cellCnt = Mathf.CeilToInt(Mathf.Sqrt(selectedTexs.Count));
+            var atlasPaddedSize = cellCnt * textureSize + (cellCnt - 1) * atlasPadding;
+            if (textureAtlas == null || textureAtlas.width != atlasPaddedSize)
+            {
+                if (textureAtlas != null)
+                {
+                    GameObject.DestroyImmediate(textureAtlas, false);
+                }
+
+                textureAtlas = new Texture2D(atlasPaddedSize, atlasPaddedSize,
+                    graphicsFormat, (int)Mathf.Log(2, atlasPaddedSize) + 1, TextureCreationFlags.None)
+                {
+                    wrapMode = TextureWrapMode.Clamp,
+                };
+                atlasPropertiesWindow?.Close();
+                atlasPropertiesWindow = null;
+            }
+
+            UpdateResult(textureAtlas, cellCnt);
+            if (!atlasPropertiesWindow)
+            {
+                atlasPropertiesWindow = fnOpenPropertyEditor(textureAtlas, true);
+                try
+                {
+                    this.Dock(atlasPropertiesWindow, Docker.DockPosition.Right);
+                }
+                catch
+                {
+                }
+            }
+            atlasPropertiesWindow.Repaint();
+        }
+        else
+        {
+            atlasPropertiesWindow?.Close();
+            atlasPropertiesWindow = null;
+            if (textureArray == null || textureArray.depth != selectedTexs.Count || textureArray.width != textureSize)
+            {
+                if (textureArray != null)
+                {
+                    GameObject.DestroyImmediate(textureArray, false);
+                }
+
+                textureArray = new Texture2DArray(textureSize,
+                    textureSize, selectedTexs.Count, graphicsFormat, TextureCreationFlags.None, 12)
+                {
+                    wrapMode = TextureWrapMode.Clamp,
+                };
+
+                arrayPropertiesWindow?.Close();
+                arrayPropertiesWindow = null;
+            }
+
+            UpdateResult(textureArray);
+            if (!arrayPropertiesWindow)
+            {
+                arrayPropertiesWindow = fnOpenPropertyEditor(textureArray, true);
+                this.Dock(arrayPropertiesWindow, Docker.DockPosition.Right);
+            }
+            arrayPropertiesWindow.Repaint();
+        }
+    }
+
+    private void AddTexture(Texture2D texture2D)
+    {
+        if(TextureMapIndex.Instance.ResultGuid2TextureMap.TryGetValue(AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(texture2D)), out var mapInfo))
+        {
+            selectedTexs.Clear();
+            textureMapInfo = mapInfo;
+            InitWithTextureMapInfo(textureMapInfo);
+        }
+
+        if (texture2D.width % textureSize != 0)
+        {
+            EditorUtility.DisplayDialog("提示", $"贴图 {texture2D.name} 尺寸错误", "ok");
+            return;
+        }
+
+        if(selectedTexs.Count == MaxArraySize)
+        {
+            EditorUtility.DisplayDialog("提示", $"贴图数量最多 {MaxArraySize}", "ok");
+            return;
+        }
+        
+        if (!selectedTexs.Contains(texture2D))
+        {
+            selectedTexs.Add(texture2D);
+            texRects.Add(new Rect());
+        }
+        else
+        {
+            ToastManager.ShowNotification(new Toast.ToastArgs()
+            {
+                Title = "Info",
+                Message = "当前图片已存在",
+                LifeTime = 2f, 
+                Severity = Toast.ToastSeverity.Info,
+                ToastPosition = Toast.ToastPosition.TopCenter
+            });
+            return;
+        }
+
+        imgCntLabel.text = selectedTexs.Count.ToString();
+        UpdateResult();
+    }
+
+    private void RmTexture(Texture2D texture2D)
+    {
+        var idx = selectedTexs.IndexOf(texture2D);
+        if (idx != -1)
+        {
+            texRects.RemoveAt(idx);
+            selectedTexs.RemoveAt(idx);
+        }
+
+        imgCntLabel.text = selectedTexs.Count.ToString();
+        UpdateResult();
+    }
+
+    private void UpdateMapinfoBeforeSave()
+    {
+        textureMapInfo.Textures = selectedTexs;
+        var hasAlpha = GraphicsFormatUtility.HasAlphaChannel(selectedTexs[0].graphicsFormat);
+        for (int i = 1; i < selectedTexs.Count; i++)
+        {
+            var tex = selectedTexs[i];
+            if (hasAlpha != GraphicsFormatUtility.HasAlphaChannel(tex.graphicsFormat))
+            {
+                if(!EditorUtility.DisplayDialog("警告", $"源贴图 alpha 不一致 :{tex.name}", "继续", "取消"))
+                {
+                    return;
+                }
+            }
+        }
+        
+        var rmLs = textureMapInfo.OriginTexture2TextureInfo.Keys.Where(t => !selectedTexs.Contains(t)).ToList();
+        foreach (var rm in rmLs)
+        {
+            textureMapInfo.OriginTexture2TextureInfo.Remove(rm);
+        }
+
+        if (textureMapInfo.PackType == TextureMapInfo.EPackType.Atlas)
+        {
+            GameObject.DestroyImmediate(textureArray);
+            textureArray = null;
+            textureMapInfo.TextureArray = null;
+
+            if (string.IsNullOrEmpty(textureMapInfo.TextureAtlasPath))
+            {
+                var savePath = EditorUtility.SaveFilePanelInProject("保存", "", "png", "");
+                if (string.IsNullOrEmpty(savePath))
+                {
+                    return;
+                }
+                textureMapInfo.TextureAtlasPath = savePath;
+            }
+
+            AsyncGPUReadback.Request(textureAtlas, 0, (req) =>
+            {
+                if (!req.hasError)
+                {
+                    {
+                        using var dataArray = ImageConversion.EncodeNativeArrayToPNG(req.GetData<byte>(), textureAtlas.graphicsFormat, (uint)textureAtlas.width, (uint)textureAtlas.height);
+                        using var fr = File.OpenWrite(textureMapInfo.TextureAtlasPath);
+                        fr.Write(dataArray);
+                    }
+               
+                    AssetDatabase.ImportAsset(textureMapInfo.TextureAtlasPath);
+                    if(TextureImporter.GetAtPath(textureMapInfo.TextureAtlasPath) is TextureImporter ti)
+                    {
+                        ti.SetTextureSettings(new TextureImporterSettings()
+                        {
+                            textureShape = TextureImporterShape.Texture2D,
+                            flipbookColumns = 1,
+                            flipbookRows = 1,
+                            sRGBTexture = false,
+                            readable = false,
+                            mipmapEnabled = true,
+                            wrapMode = TextureWrapMode.Clamp,
+                        });
+                        ti.SaveAndReimport();
+                    }
+
+                    EditorApplication.delayCall += () =>
+                    {
+                        textureMapInfo.TextureAtlas = AssetDatabase.LoadAssetAtPath<Texture2D>(textureMapInfo.TextureAtlasPath);
+                        var guid = AssetDatabase.AssetPathToGUID(textureMapInfo.TextureAtlasPath);
+                        TextureMapIndex.Instance.ResultGuid2TextureMap[guid] = textureMapInfo;
+                        EditorGUIUtility.PingObject(textureMapInfo.TextureAtlas);
+                    };
+                }
+            });
+        }
+        else
+        {
+            GameObject.DestroyImmediate(textureAtlas);
+            textureAtlas = null;
+            textureMapInfo.TextureAtlas = null;
+            if (string.IsNullOrEmpty(textureMapInfo.TextureArrayPath))
+            {
+                var savePath = EditorUtility.SaveFilePanelInProject("保存", "", "png", "");
+                if (string.IsNullOrEmpty(savePath))
+                {
+                    return;
+                }
+                textureMapInfo.TextureArrayPath = savePath;
+            }
+            
+            AsyncGPUReadback.Request(textureArray, 0, 0, textureArray.width, 0, textureArray.height, 0, textureArray.depth, (req) =>
+            {
+                if (!req.hasError)
+                {
+                    {
+                        using var fr = File.Open(textureMapInfo.TextureArrayPath, FileMode.OpenOrCreate);
+                        using MemoryStream memoryStream = new MemoryStream();
+                        for (int i = textureArray.depth - 1; i >=0 ; --i)
+                        {
+                            var array = req.GetData<byte>(i);
+                            memoryStream.Write(array);
+                        }
+                        memoryStream.Seek(0, SeekOrigin.Begin);
+                     
+                        var dataArray = ImageConversion.EncodeArrayToPNG(memoryStream.GetBuffer(), textureArray.graphicsFormat, (uint)textureArray.width, (uint)textureArray.height * (uint)textureArray.depth);
+                        fr.Write(dataArray);
+                    }
+                    
+                    AssetDatabase.ImportAsset(textureMapInfo.TextureArrayPath);
+                    if (TextureImporter.GetAtPath(textureMapInfo.TextureArrayPath) is TextureImporter ti)
+                    {
+                        ti.SetTextureSettings(new TextureImporterSettings()
+                        {
+                            textureShape = TextureImporterShape.Texture2DArray,
+                            flipbookColumns = 1,
+                            flipbookRows = textureArray.depth,
+                            sRGBTexture = false,
+                            readable = false,
+                            mipmapEnabled = true,
+                            wrapMode = TextureWrapMode.Clamp,
+                        });
+                        ti.SaveAndReimport();
+                    }
+
+                    textureMapInfo.TextureArray = AssetDatabase.LoadAssetAtPath<Texture2DArray>(textureMapInfo.TextureArrayPath);
+                    var guid = AssetDatabase.AssetPathToGUID(textureMapInfo.TextureArrayPath);
+                    TextureMapIndex.Instance.ResultGuid2TextureMap[guid] = textureMapInfo;
+                    EditorGUIUtility.PingObject(textureMapInfo.TextureArray);
+                }
+            });
+        }
+
+        AssetDatabase.SaveAssetIfDirty(TextureMapIndex.Instance);
+    }
+
+    private void Save()
+    {
+        if (AssetDatabase.IsMainAsset(textureMapInfo))
+        {
+            UpdateMapinfoBeforeSave();
+            AssetDatabase.SaveAssetIfDirty(textureMapInfo);
+        }
+        else
+        {
+            var path = EditorUtility.SaveFilePanelInProject("保存映射关系", DateTime.Now.ToString("yy_MM_dd_hhmmss"), "asset", "保存源贴图到 atlas 对应关系", TextureMapInfo.TextureMapDir);
+            if(string.IsNullOrEmpty(path))
+            {
+                return;
+            }
+
+            AssetDatabase.CreateAsset(textureMapInfo, path);
+            UpdateMapinfoBeforeSave();
+            AssetDatabase.SaveAssetIfDirty(textureMapInfo);
+        }
+        base.SaveChanges();
+        AssetDatabase.Refresh();
+    }
+
+    private void OnDestroy()
+    {
+        SetNormalOriginTextureFormat(textureMapInfo.IsNormalMap);
+        AssetDatabase.SaveAssetIfDirty(textureMapInfo);
+    }
+}
diff --git a/Assets/Editor/TexturePack/TexturePackerEditor.cs.meta b/Assets/Editor/TexturePack/TexturePackerEditor.cs.meta
new file mode 100644
index 0000000..47b5a21
--- /dev/null
+++ b/Assets/Editor/TexturePack/TexturePackerEditor.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 2404f4f9e7a763d43bbfb35a692fd4de
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences:
+  - m_VisualTreeAsset: {fileID: 9197481963319205126, guid: c6684732fa3c07d4c8f22c9db825d83f, type: 3}
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/TexturePack/TexturePackerEditor.uss b/Assets/Editor/TexturePack/TexturePackerEditor.uss
new file mode 100644
index 0000000..218263a
--- /dev/null
+++ b/Assets/Editor/TexturePack/TexturePackerEditor.uss
@@ -0,0 +1,5 @@
+.custom-label {
+    font-size: 20px;
+    -unity-font-style: bold;
+    color: rgb(68, 138, 255);
+}
\ No newline at end of file
diff --git a/Assets/Editor/TexturePack/TexturePackerEditor.uss.meta b/Assets/Editor/TexturePack/TexturePackerEditor.uss.meta
new file mode 100644
index 0000000..51f3319
--- /dev/null
+++ b/Assets/Editor/TexturePack/TexturePackerEditor.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3573072381d449344b583e330c972639
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Assets/Editor/TexturePack/TexturePackerEditor.uxml b/Assets/Editor/TexturePack/TexturePackerEditor.uxml
new file mode 100644
index 0000000..efeb54f
--- /dev/null
+++ b/Assets/Editor/TexturePack/TexturePackerEditor.uxml
@@ -0,0 +1,16 @@
+<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="True">
+    <Style src="project://database/Assets/Editor/TexturePack/TexturePackerEditor.uss?fileID=7433441132597879392&amp;guid=3573072381d449344b583e330c972639&amp;type=3#TexturePackerEditor" />
+    <uie:Toolbar style="font-size: 16px; height: auto; flex-wrap: nowrap; align-items: auto; align-self: auto; justify-content: flex-start; flex-direction: row;">
+        <ui:Button text="Atlas" parse-escape-sequences="true" display-tooltip-when-elided="true" name="btAtlas" style="visibility: visible; overflow: hidden; opacity: 1; flex-wrap: nowrap; border-top-left-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; border-bottom-left-radius: 5px; margin-right: 0; font-size: 16px; -unity-background-scale-mode: stretch-to-fill; background-color: rgb(88, 88, 88);" />
+        <ui:Button text="Array" parse-escape-sequences="true" display-tooltip-when-elided="true" name="btArray" style="border-top-left-radius: 0; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 0; margin-left: 0; font-size: 16px; background-color: rgb(88, 88, 88);" />
+        <ui:Label tabindex="-1" text="0" parse-escape-sequences="true" display-tooltip-when-elided="true" name="imgCntLabel" style="flex-direction: row; justify-content: space-between; align-items: auto; align-self: stretch; margin-left: 4px; -unity-text-align: middle-center;" />
+        <ui:Toggle label="法线图" name="tgIsNormal" style="width: 150px; left: auto; right: auto; flex-direction: row; align-items: stretch; justify-content: center; align-self: center; white-space: normal; text-overflow: clip; -unity-text-align: middle-right; margin-right: 2px;" />
+        <ui:SliderInt label="图集间距" high-value="5" name="slAtlasPadding" style="width: 200px; -unity-text-align: middle-right; white-space: nowrap; text-overflow: clip; font-size: 15px;" />
+        <ui:EnumField label="贴图尺寸" type="TexturePackerEditor+ETextureSize, Assembly-CSharp-Editor" value="_512" name="textureSizeEnum" style="width: 181px; justify-content: flex-end; -unity-text-align: upper-right;" />
+        <ui:Button text="Save" parse-escape-sequences="true" display-tooltip-when-elided="true" name="btSave" style="translate: 100px 0;" />
+    </uie:Toolbar>
+    <ui:Label tabindex="-1" text="Label" parse-escape-sequences="true" display-tooltip-when-elided="true" name="infoLabel" style="visibility: hidden;" />
+    <ui:VisualElement style="flex-grow: 1; flex-direction: row; height: 100%;">
+        <ui:IMGUIContainer name="imgList" style="width: 100%; height: 100%; min-height: initial; max-height: none; justify-content: space-around; flex-direction: column;" />
+    </ui:VisualElement>
+</ui:UXML>
diff --git a/Assets/Editor/TexturePack/TexturePackerEditor.uxml.meta b/Assets/Editor/TexturePack/TexturePackerEditor.uxml.meta
new file mode 100644
index 0000000..3333069
--- /dev/null
+++ b/Assets/Editor/TexturePack/TexturePackerEditor.uxml.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: c6684732fa3c07d4c8f22c9db825d83f
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/Assets/Editor/Toast.meta b/Assets/Editor/Toast.meta
new file mode 100644
index 0000000..67332bf
--- /dev/null
+++ b/Assets/Editor/Toast.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 087f6d793c10f674f93ad712b17533a6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/Toast/Toast.cs b/Assets/Editor/Toast/Toast.cs
new file mode 100644
index 0000000..9512a68
--- /dev/null
+++ b/Assets/Editor/Toast/Toast.cs
@@ -0,0 +1,280 @@
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace UnityEditor
+{
+    internal class Toast : EditorWindow
+    {
+        private const int DWMWA_WINDOW_CORNER_PREFERENCE = 33;
+
+        private enum DWM_WINDOW_CORNER_PREFERENCE
+        {
+            DWMWCP_DEFAULT = 0,
+            DWMWCP_DONOTROUND = 1,
+            DWMWCP_ROUND = 2,
+            DWMWCP_ROUNDSMALL = 3
+        }
+
+        public enum ToastSeverity
+        {
+            Info,
+            Warning,
+            Error
+        }
+
+        public enum ToastPosition
+        {
+            TopLeft,
+            TopRight,
+            TopCenter,
+            BottomLeft,
+            BottomRight,
+            BottomCenter
+        }
+
+        public struct ToastData
+        {
+            public float TimeCreated { get; set; }
+            public ToastArgs ToastArgs { get; set; }
+        }
+
+        public struct ToastArgs
+        {
+            public string Title { get; set; }
+            public string Message { get; set; }
+            public ToastPosition ToastPosition { get; set; }
+            public float LifeTime { get; set; }
+            public bool NoTimeOut { get; set; }
+            public Func<VisualElement> CustomContent { get; set; }
+            public ToastSeverity Severity { get; set; }
+        }
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetActiveWindow();
+
+        [DllImport("dwmapi.dll")]
+        private static extern int DwmSetWindowAttribute(IntPtr hwnd, int attr, ref DWM_WINDOW_CORNER_PREFERENCE pref, int attrLen);
+
+        private const float POSITION_SPEED = 10f;
+        private const float POSITION_THRESHOLD = 0.1f;
+        private const float ROOT_CORNER_RADIUS = 9.2f;
+        private const float ROOT_BORDER_WIDTH = 2f;
+
+        public ToastData Data { get; set; }
+        public ToastArgs Args;
+
+        public event Action<Toast> OnClose;
+
+        private Rect currentPosition;
+
+        private VisualElement titleBar;
+        private Label titleLabel;
+        private Label messageLabel;
+        private Button closeButton;
+        private VisualElement contentContainer;
+        private ProgressBar lifetimeBar;
+
+        public void SetupWindow(ToastData toastData)
+        {
+            Data = toastData;
+            Args = toastData.ToastArgs;
+            position = this.GetEditorWindowPosition(Args.ToastPosition);
+            currentPosition = position;
+
+            titleLabel.text = Args.Title;
+            messageLabel.text = Args.Message;
+            contentContainer.Add(Args.CustomContent?.Invoke());
+
+            var backgroundColor = Args.Severity switch
+            {
+                ToastSeverity.Info => new Color(0.27f, 0.38f, 0.49f),
+                ToastSeverity.Warning => new Color(0.69f, 0.5f, 0.02f),
+                _ => new Color(0.49f, 0f, 0f)
+            };
+
+            lifetimeBar.lowValue = 0;
+            var datatoastArgs = Data.ToastArgs;
+            lifetimeBar.value = lifetimeBar.highValue = datatoastArgs.NoTimeOut ? 1f : datatoastArgs.LifeTime;
+
+            var lifetimeBarContainer = lifetimeBar.Children().First();
+            var lifetimeBarBackground = lifetimeBarContainer.Children().First();
+            var lifetimeBarFill = lifetimeBarBackground.Children().First();
+            if (lifetimeBarFill != null)
+            {
+                lifetimeBarFill.style.backgroundColor = backgroundColor;
+            }
+
+            titleBar.style.backgroundColor = backgroundColor;
+
+            closeButton.RegisterCallback<PointerEnterEvent>(evt =>
+            {
+                closeButton.style.backgroundColor = backgroundColor;
+            });
+
+            closeButton.RegisterCallback<PointerLeaveEvent>(evt =>
+            {
+                closeButton.style.backgroundColor = new Color(0.31f, 0.31f, 0.31f);
+            });
+
+            EnableRoundedCorners();
+        }
+
+        private void EnableRoundedCorners()
+        {
+            IntPtr hwnd = GetActiveWindow();
+            if (hwnd != IntPtr.Zero)
+            {
+                DWM_WINDOW_CORNER_PREFERENCE pref = DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND;
+                DwmSetWindowAttribute(hwnd, DWMWA_WINDOW_CORNER_PREFERENCE, ref pref, sizeof(int));
+            }
+            else
+            {
+                Debug.LogWarning("Failed to get window handle.");
+            }
+        }
+
+        private void CreateGUI()
+        {
+            rootVisualElement.style.borderTopWidth = ROOT_BORDER_WIDTH;
+            rootVisualElement.style.borderBottomWidth = ROOT_BORDER_WIDTH;
+            rootVisualElement.style.borderLeftWidth = ROOT_BORDER_WIDTH;
+            rootVisualElement.style.borderRightWidth = ROOT_BORDER_WIDTH;
+            rootVisualElement.style.borderTopColor = Color.black;
+            rootVisualElement.style.borderBottomColor = Color.black;
+            rootVisualElement.style.borderLeftColor = Color.black;
+            rootVisualElement.style.borderRightColor = Color.black;
+            rootVisualElement.style.borderTopLeftRadius = ROOT_CORNER_RADIUS;
+            rootVisualElement.style.borderTopRightRadius = ROOT_CORNER_RADIUS;
+            rootVisualElement.style.borderBottomLeftRadius = ROOT_CORNER_RADIUS;
+            rootVisualElement.style.borderBottomRightRadius = ROOT_CORNER_RADIUS;
+
+            titleBar = new VisualElement
+            {
+                style =
+                {
+                    height = 20f,
+                    minHeight = 20f,
+                    width = new StyleLength(Length.Percent(100)),
+                    maxWidth = new StyleLength(Length.Percent(100)),
+                    flexDirection = FlexDirection.Row,
+                    borderBottomWidth = 1f,
+                    borderBottomColor = Color.black
+                }
+            };
+            rootVisualElement.Add(titleBar);
+            {
+                titleLabel = new Label()
+                {
+                    style =
+                    {
+                        flexGrow = 1f,
+                        unityFontStyleAndWeight = FontStyle.Bold,
+                        fontSize = 13f,
+                        unityTextAlign = TextAnchor.MiddleLeft
+                    }
+                };
+                titleBar.Add(titleLabel);
+
+                closeButton = new Button(Close)
+                {
+                    text = "X",
+                    style =
+                    {
+                        flexGrow = 0f,
+                        width = 20f,
+                        minWidth = 20f,
+                        borderBottomWidth = 0f,
+                        borderLeftWidth = 1f,
+                        borderRightWidth = 0f,
+                        borderTopWidth = 0f,
+                        borderTopLeftRadius = 0f,
+                        borderTopRightRadius = 0f,
+                        borderBottomRightRadius = 0f,
+                        borderBottomLeftRadius = 0f,
+                        marginRight = 0f,
+                        marginLeft = 0f,
+                        marginTop = 0f,
+                        marginBottom = 0f
+                    }
+                };
+                titleBar.Add(closeButton);
+            }
+
+            lifetimeBar = new ProgressBar
+            {
+                style =
+                {
+                    marginBottom = 0f,
+                    marginLeft = 0f,
+                    marginRight = 0f,
+                    marginTop = 0f,
+                    height = 6f,
+                    minHeight = 6f,
+                    maxHeight = 6f
+                }
+            };
+            rootVisualElement.Add(lifetimeBar);
+
+            var messageContainer = new VisualElement();
+            rootVisualElement.Add(messageContainer);
+            {
+                messageLabel = new Label
+                {
+                    style =
+                    {
+                        marginTop = 2f,
+                        marginBottom = 2f,
+                        marginLeft = 2f,
+                        marginRight = 2f,
+                    }
+                };
+                messageContainer.Add(messageLabel);
+            }
+
+            contentContainer = new VisualElement();
+            rootVisualElement.Add(contentContainer);
+        }
+
+        public float GetHeight() => position.height;
+
+        public void UpdatePosition(Rect positionRect, float currentHeightOffset, double deltaTime)
+        {
+            var targetPosition = new Rect(positionRect.x, positionRect.y + currentHeightOffset, positionRect.width, positionRect.height);
+
+            if (Mathf.Abs(currentPosition.y - targetPosition.y) < POSITION_THRESHOLD)
+            {
+                currentPosition.y = targetPosition.y;
+                position = currentPosition;
+            }
+            else
+            {
+                var newY = Mathf.Lerp(
+                    currentPosition.y,
+                    targetPosition.y,
+                    (float)(POSITION_SPEED * deltaTime)
+                );
+                currentPosition.y = newY;
+                currentPosition.x = targetPosition.x;
+
+                position = currentPosition;
+            }
+        }
+
+        public bool IsLifetimeOver()
+        {
+            if (Args.NoTimeOut) return false;
+
+            var currentLifeTime = Time.time - Data.TimeCreated;
+            lifetimeBar.value = Args.LifeTime - currentLifeTime;
+            return currentLifeTime > Args.LifeTime;
+        }
+
+        private void OnDestroy()
+        {
+            OnClose?.Invoke(this);
+        }
+    }
+}
diff --git a/Assets/Editor/Toast/Toast.cs.meta b/Assets/Editor/Toast/Toast.cs.meta
new file mode 100644
index 0000000..efbfe99
--- /dev/null
+++ b/Assets/Editor/Toast/Toast.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a4ee447634db23c4ba147df9d96ff3eb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/Toast/ToastHelpers.cs b/Assets/Editor/Toast/ToastHelpers.cs
new file mode 100644
index 0000000..4ab96d6
--- /dev/null
+++ b/Assets/Editor/Toast/ToastHelpers.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using UnityEngine;
+using static UnityEditor.Toast;
+
+namespace UnityEditor
+{
+    public static class ToastHelpers
+    {
+        private static readonly Vector4 WINDOW_PADDING = new Vector4(10f, 30f, 80f, 10f);
+
+        [DllImport("user32.dll")]
+        private static extern bool GetWindowRect(IntPtr hwnd, ref Rect rectangle);
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct Rect
+        {
+            public int Left { get; set; }
+            public int Top { get; set; }
+            public int Right { get; set; }
+            public int Bottom { get; set; }
+
+            public UnityEngine.Rect ToUnityRect()
+            {
+                return new UnityEngine.Rect(Left, Top, Right - Left, Bottom - Top);
+            }
+        }
+
+        internal static UnityEngine.Rect GetEditorWindowPosition(this EditorWindow window, ToastPosition corner)
+        {
+            Vector2 windowSize = window.position.size;
+
+            Rect editorRect = new Rect();
+            GetWindowRect(Process.GetCurrentProcess().MainWindowHandle, ref editorRect);
+            UnityEngine.Rect unityEditorRect = editorRect.ToUnityRect();
+
+            Vector2 position = CalculatePosition(corner, unityEditorRect, windowSize);
+            return new UnityEngine.Rect(position.x, position.y, windowSize.x, windowSize.y);
+        }
+
+        private static Vector2 CalculatePosition(ToastPosition corner, UnityEngine.Rect editorRect, Vector2 windowSize)
+        {
+            return corner switch
+            {
+                ToastPosition.TopLeft => new Vector2(
+                    editorRect.x + WINDOW_PADDING.w,
+                    editorRect.y + WINDOW_PADDING.z),
+                ToastPosition.TopRight => new Vector2(
+                    editorRect.xMax - windowSize.x - WINDOW_PADDING.x,
+                    editorRect.y + WINDOW_PADDING.z),
+                ToastPosition.TopCenter => new Vector2(
+                    editorRect.center.x - windowSize.x / 2 - WINDOW_PADDING.x,
+                    editorRect.y + WINDOW_PADDING.z),
+                ToastPosition.BottomLeft => new Vector2(
+                    editorRect.x + WINDOW_PADDING.w,
+                    editorRect.yMax - windowSize.y - WINDOW_PADDING.y),
+                ToastPosition.BottomRight => new Vector2(
+                    editorRect.xMax - windowSize.x - WINDOW_PADDING.x,
+                    editorRect.yMax - windowSize.y - WINDOW_PADDING.y),
+                ToastPosition.BottomCenter => new Vector2(
+                    editorRect.center.x - windowSize.x / 2 - WINDOW_PADDING.x,
+                    editorRect.yMax - windowSize.y - WINDOW_PADDING.y),
+                _ => throw new ArgumentOutOfRangeException(nameof(corner), corner, null)
+            };
+        }
+    }
+}
diff --git a/Assets/Editor/Toast/ToastHelpers.cs.meta b/Assets/Editor/Toast/ToastHelpers.cs.meta
new file mode 100644
index 0000000..b88da49
--- /dev/null
+++ b/Assets/Editor/Toast/ToastHelpers.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 37ad6836e727b8a45adbf7ab3a6826cd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Editor/Toast/ToastManager.cs b/Assets/Editor/Toast/ToastManager.cs
new file mode 100644
index 0000000..58b8d11
--- /dev/null
+++ b/Assets/Editor/Toast/ToastManager.cs
@@ -0,0 +1,315 @@
+
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using static UnityEditor.Toast;
+
+namespace UnityEditor
+{
+    internal static class ToastManager
+    {
+        private const float NOTIFICATION_MARGIN = 5f;
+        private const double TARGET_FRAME_TIME = 1.0 / 30.0;
+
+        private static readonly List<Toast> topLeftNotifications = new();
+        private static readonly List<Toast> topRightNotifications = new();
+        private static readonly List<Toast> topCenterNotifications = new();
+        private static readonly List<Toast> bottomLeftNotifications = new();
+        private static readonly List<Toast> bottomRightNotifications = new();
+        private static readonly List<Toast> bottomCenterNotifications = new();
+
+        private static int notificationCount = 0;
+
+        [InitializeOnLoadMethod]
+        private static void Init()
+        {
+            AssemblyReloadEvents.beforeAssemblyReload += OnBeforeDomainReload;
+
+            EnsureUpdateHook();
+
+            EditorApplication.QueuePlayerLoopUpdate();
+        }
+
+        private static void EnsureUpdateHook()
+        {
+            EditorApplication.update -= CustomUpdateLoop;
+            EditorApplication.update += CustomUpdateLoop;
+        }
+
+        private static void OnBeforeDomainReload()
+        {
+            //close all notifications on domain reload
+            EditorApplication.update -= CustomUpdateLoop;
+
+            for (var index = topLeftNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = topLeftNotifications[index];
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = topRightNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = topRightNotifications[index];
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = topCenterNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = topCenterNotifications[index];
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = bottomLeftNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = bottomLeftNotifications[index];
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = bottomRightNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = bottomRightNotifications[index];
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = bottomCenterNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = bottomCenterNotifications[index];
+                RemoveNotification(notification);
+                notification.Close();
+            }
+        }
+
+        private static void CustomUpdateLoop()
+        {
+            if (notificationCount <= 0) return;
+
+            UpdateNotifications(TARGET_FRAME_TIME);
+
+            if (!EditorApplication.isPlaying || notificationCount > 0)
+            {
+                EditorApplication.delayCall += () =>
+                {
+                    EditorWindow.focusedWindow?.Repaint();
+                    SceneView.RepaintAll();
+                };
+            }
+        }
+
+        private static void UpdateNotifications(double deltaTime)
+        {
+            CheckNotificationLifetimes();
+
+            UpdateNotificationPositions(deltaTime);
+        }
+
+        private static void CheckNotificationLifetimes()
+        {
+            for (var index = topLeftNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = topLeftNotifications[index];
+                if (!notification.IsLifetimeOver()) continue;
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = topRightNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = topRightNotifications[index];
+                if (!notification.IsLifetimeOver()) continue;
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = topCenterNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = topCenterNotifications[index];
+                if (!notification.IsLifetimeOver()) continue;
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = bottomLeftNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = bottomLeftNotifications[index];
+                if (!notification.IsLifetimeOver()) continue;
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = bottomRightNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = bottomRightNotifications[index];
+                if (!notification.IsLifetimeOver()) continue;
+                RemoveNotification(notification);
+                notification.Close();
+            }
+
+            for (var index = bottomCenterNotifications.Count - 1; index >= 0; index--)
+            {
+                var notification = bottomCenterNotifications[index];
+                if (!notification.IsLifetimeOver()) continue;
+                RemoveNotification(notification);
+                notification.Close();
+            }
+        }
+
+        private static void UpdateNotificationPositions(double deltaTime)
+        {
+            UpdateNotificationPositions(ToastPosition.TopLeft, deltaTime);
+            UpdateNotificationPositions(ToastPosition.TopRight, deltaTime);
+            UpdateNotificationPositions(ToastPosition.TopCenter, deltaTime);
+            UpdateNotificationPositions(ToastPosition.BottomLeft, deltaTime);
+            UpdateNotificationPositions(ToastPosition.BottomRight, deltaTime);
+            UpdateNotificationPositions(ToastPosition.BottomCenter, deltaTime);
+        }
+
+        public static void ShowNotification(ToastArgs toastArgs, Vector2 windowSize = default)
+        {
+            EnsureUpdateHook();
+
+            //Create the window
+            var notification = ScriptableObject.CreateInstance<Toast>();
+
+            notification.titleContent = new GUIContent($"Notification - {toastArgs.Title}");
+            notification.minSize = windowSize == default ? new Vector2(250, 100) : windowSize;
+            notification.maxSize = notification.minSize;
+            notification.position = new Rect(0, 0, notification.minSize.x, notification.minSize.y);
+            notification.ShowPopup();
+
+            notification.OnClose += RemoveNotification;
+
+            //Set position
+            notification.SetupWindow(new ToastData
+            {
+                ToastArgs = toastArgs,
+                TimeCreated = Time.time,
+            });
+
+            //Update other notifications
+            AddNotification(notification);
+
+        }
+
+        private static void AddNotification(Toast toast)
+        {
+            switch (toast.Args.ToastPosition)
+            {
+                case ToastPosition.TopLeft:
+                    topLeftNotifications.Insert(0, toast);
+                    break;
+                case ToastPosition.TopRight:
+                    topRightNotifications.Insert(0, toast);
+                    break;
+                case ToastPosition.TopCenter:
+                    topCenterNotifications.Insert(0, toast);
+                    break;
+                case ToastPosition.BottomLeft:
+                    bottomLeftNotifications.Insert(0, toast);
+                    break;
+                case ToastPosition.BottomRight:
+                    bottomRightNotifications.Insert(0, toast);
+                    break;
+                case ToastPosition.BottomCenter:
+                    bottomCenterNotifications.Insert(0, toast);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(null);
+            }
+
+            notificationCount++;
+        }
+
+        private static void RemoveNotification(Toast toast)
+        {
+            toast.OnClose -= RemoveNotification;
+            switch (toast.Args.ToastPosition)
+            {
+                case ToastPosition.TopLeft:
+                    topLeftNotifications.Remove(toast);
+                    break;
+                case ToastPosition.TopRight:
+                    topRightNotifications.Remove(toast);
+                    break;
+                case ToastPosition.TopCenter:
+                    topCenterNotifications.Remove(toast);
+                    break;
+                case ToastPosition.BottomLeft:
+                    bottomLeftNotifications.Remove(toast);
+                    break;
+                case ToastPosition.BottomRight:
+                    bottomRightNotifications.Remove(toast);
+                    break;
+                case ToastPosition.BottomCenter:
+                    bottomCenterNotifications.Remove(toast);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(null);
+            }
+
+            notificationCount--;
+        }
+
+        private static void UpdateNotificationPositions(ToastPosition toastPosition, double deltaTime)
+        {
+            var currentHeightOffset = 0f;
+            switch (toastPosition)
+            {
+                case ToastPosition.TopLeft:
+                    foreach (var currentNotification in topLeftNotifications)
+                    {
+                        var positionRect = currentNotification.GetEditorWindowPosition(toastPosition);
+                        currentNotification.UpdatePosition(positionRect, currentHeightOffset, deltaTime);
+                        currentHeightOffset += currentNotification.GetHeight() + NOTIFICATION_MARGIN;
+                    }
+                    break;
+                case ToastPosition.TopRight:
+                    foreach (var currentNotification in topRightNotifications)
+                    {
+                        var positionRect = currentNotification.GetEditorWindowPosition(toastPosition);
+                        currentNotification.UpdatePosition(positionRect, currentHeightOffset, deltaTime);
+                        currentHeightOffset += currentNotification.GetHeight() + NOTIFICATION_MARGIN;
+                    }
+                    break;
+                case ToastPosition.TopCenter:
+                    foreach (var currentNotification in topCenterNotifications)
+                    {
+                        var positionRect = currentNotification.GetEditorWindowPosition(toastPosition);
+                        currentNotification.UpdatePosition(positionRect, currentHeightOffset, deltaTime);
+                        currentHeightOffset += currentNotification.GetHeight() + NOTIFICATION_MARGIN;
+                    }
+                    break;
+                case ToastPosition.BottomLeft:
+                    foreach (var currentNotification in bottomLeftNotifications)
+                    {
+                        var positionRect = currentNotification.GetEditorWindowPosition(toastPosition);
+                        currentNotification.UpdatePosition(positionRect, currentHeightOffset, deltaTime);
+                        currentHeightOffset -= currentNotification.GetHeight() + NOTIFICATION_MARGIN;
+                    }
+                    break;
+                case ToastPosition.BottomRight:
+                    foreach (var currentNotification in bottomRightNotifications)
+                    {
+                        var positionRect = currentNotification.GetEditorWindowPosition(toastPosition);
+                        currentNotification.UpdatePosition(positionRect, currentHeightOffset, deltaTime);
+                        currentHeightOffset -= currentNotification.GetHeight() + NOTIFICATION_MARGIN;
+                    }
+                    break;
+                case ToastPosition.BottomCenter:
+                    foreach (var currentNotification in bottomCenterNotifications)
+                    {
+                        var positionRect = currentNotification.GetEditorWindowPosition(toastPosition);
+                        currentNotification.UpdatePosition(positionRect, currentHeightOffset, deltaTime);
+                        currentHeightOffset -= currentNotification.GetHeight() + NOTIFICATION_MARGIN;
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(toastPosition), toastPosition, null);
+            }
+        }
+    }
+}
diff --git a/Assets/Editor/Toast/ToastManager.cs.meta b/Assets/Editor/Toast/ToastManager.cs.meta
new file mode 100644
index 0000000..0859681
--- /dev/null
+++ b/Assets/Editor/Toast/ToastManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 139b75263d3a3114284081ea2fa45c0f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/Cockpit/OffsetMap.png b/Assets/Scenes/Cockpit/OffsetMap.png
new file mode 100644
index 0000000..273d9c6
Binary files /dev/null and b/Assets/Scenes/Cockpit/OffsetMap.png differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/Cockpit/OffsetMap.png.meta
similarity index 82%
rename from Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_light.exr.meta
rename to Assets/Scenes/Cockpit/OffsetMap.png.meta
index 683ba15..1d505ba 100644
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_light.exr.meta
+++ b/Assets/Scenes/Cockpit/OffsetMap.png.meta
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 9840c959c70baa041b9679de47ac8262
+guid: 23bca372b3a59a54cbf1fd4e61df5dad
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -22,7 +22,7 @@ TextureImporter:
     normalMapFilter: 0
     flipGreenChannel: 0
   isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   ignoreMipmapLimit: 0
@@ -35,11 +35,11 @@ TextureImporter:
   textureSettings:
     serializedVersion: 2
     filterMode: 1
-    aniso: 3
+    aniso: 1
     mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
   nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
@@ -51,10 +51,10 @@ TextureImporter:
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 6
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -72,19 +72,6 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -94,7 +81,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
diff --git a/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat.mat b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat.mat
index 3750345..c527593 100644
--- a/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat.mat
+++ b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat.mat
@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
+%TAG !u! tag:unity3d.com,2011:
 --- !u!114 &-7515216427237867766
 MonoBehaviour:
   m_ObjectHideFlags: 11
diff --git a/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_array.mat b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_array.mat
new file mode 100644
index 0000000..a36b18e
--- /dev/null
+++ b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_array.mat
@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7515216427237867766
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Tatami_01_Mat_array
+  m_Shader: {fileID: 4800000, guid: 152a680b0196dcb42b07eb8946d46a22, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _METALLICSPECGLOSSMAP
+  - _NORMALMAP
+  - _OCCLUSIONMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 18700000, guid: 81bf274a1ba706c4ca7180b74f0e6573, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 18700000, guid: 09dc3531888d01d40b256d2c9a2f8d66, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 62a1c70c49ee48949804a1b9704d98f4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 18700000, guid: ae2eeefc3357ce548a81dd1d931413bf, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 18700000, guid: bc54459c3b598604b9c5a09f4394f985, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.802
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_array.mat.meta b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_array.mat.meta
new file mode 100644
index 0000000..dc5bde4
--- /dev/null
+++ b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_array.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 679e6d490695427429475fbb1c3d4a41
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_atlas.mat b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_atlas.mat
new file mode 100644
index 0000000..b6d41fa
--- /dev/null
+++ b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_atlas.mat
@@ -0,0 +1,140 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7515216427237867766
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Tatami_01_Mat_atlas
+  m_Shader: {fileID: 4800000, guid: d8b23892e300d52429dc66b098a9c9fc, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _METALLICSPECGLOSSMAP
+  - _NORMALMAP
+  - _OCCLUSIONMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 61c0e3aad5c7bcd4cb5a3b072ce62417, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: 6572f548082a595459f1531424a252f4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 62a1c70c49ee48949804a1b9704d98f4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 2800000, guid: ff4f3681a7495974b9475e47d0559608, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 2800000, guid: ff4f3681a7495974b9475e47d0559608, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _atlasOffset:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.08
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.9
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    - _atlasScale: 0.5
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_atlas.mat.meta b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_atlas.mat.meta
new file mode 100644
index 0000000..b522d44
--- /dev/null
+++ b/Assets/Scenes/Garden/Art/Architecture/Materials/Tatami_01_Mat_atlas.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 19ec4ad90cd554248892593afea337c9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/Art/Architecture/Meshes/Tatami_200x100_02_Mesh.fbx.meta b/Assets/Scenes/Garden/Art/Architecture/Meshes/Tatami_200x100_02_Mesh.fbx.meta
index 9897b33..85a07f5 100644
--- a/Assets/Scenes/Garden/Art/Architecture/Meshes/Tatami_200x100_02_Mesh.fbx.meta
+++ b/Assets/Scenes/Garden/Art/Architecture/Meshes/Tatami_200x100_02_Mesh.fbx.meta
@@ -37,7 +37,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1
@@ -45,6 +45,7 @@ ModelImporter:
     addColliders: 0
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
+    importPhysicalCameras: 1
     importVisibility: 1
     importBlendShapes: 1
     importCameras: 1
diff --git a/Assets/Scenes/Garden/Art/Architecture/Textures/Door_01_T_A.png.meta b/Assets/Scenes/Garden/Art/Architecture/Textures/Door_01_T_A.png.meta
index 7368720..5f5c2d3 100644
--- a/Assets/Scenes/Garden/Art/Architecture/Textures/Door_01_T_A.png.meta
+++ b/Assets/Scenes/Garden/Art/Architecture/Textures/Door_01_T_A.png.meta
@@ -3,7 +3,7 @@ guid: 79a19c16c1fb33b499cd26ba2552dedc
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -57,8 +57,8 @@ TextureImporter:
   textureType: 0
   textureShape: 1
   singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
+  flipbookRows: 2
+  flipbookColumns: 4
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
@@ -77,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -89,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -113,6 +116,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -125,6 +129,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/Garden/Art/Architecture/Textures/Tatami_01_T_N.png.meta b/Assets/Scenes/Garden/Art/Architecture/Textures/Tatami_01_T_N.png.meta
index 6737925..a6ac2fd 100644
--- a/Assets/Scenes/Garden/Art/Architecture/Textures/Tatami_01_T_N.png.meta
+++ b/Assets/Scenes/Garden/Art/Architecture/Textures/Tatami_01_T_N.png.meta
@@ -3,7 +3,7 @@ guid: 0cdf7154483eb934e8f18f84c31ae2a6
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -20,11 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
-  ignoreMasterTextureLimit: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -39,7 +40,7 @@ TextureImporter:
     wrapU: 0
     wrapV: 0
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
   spriteMode: 0
@@ -63,17 +64,20 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 1024
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -86,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -98,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -114,9 +120,8 @@ TextureImporter:
     weights: []
     secondaryTextures: []
     nameFileIdTable: {}
-  spritePackingTag: 
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/Art/Terrain/Meshes/Stone_Walkway_03_Mesh.fbx.meta b/Assets/Scenes/Garden/Art/Terrain/Meshes/Stone_Walkway_03_Mesh.fbx.meta
index f87ffe7..cf0c5b8 100644
--- a/Assets/Scenes/Garden/Art/Terrain/Meshes/Stone_Walkway_03_Mesh.fbx.meta
+++ b/Assets/Scenes/Garden/Art/Terrain/Meshes/Stone_Walkway_03_Mesh.fbx.meta
@@ -42,7 +42,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages:
     - 0.25
@@ -53,6 +53,7 @@ ModelImporter:
     addColliders: 0
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
+    importPhysicalCameras: 1
     importVisibility: 1
     importBlendShapes: 1
     importCameras: 1
diff --git a/Assets/Scenes/Garden/Art/Terrain/Textures/CherryPetalsSheet_T_A.png.meta b/Assets/Scenes/Garden/Art/Terrain/Textures/CherryPetalsSheet_T_A.png.meta
index 3935ea1..155f3fe 100644
--- a/Assets/Scenes/Garden/Art/Terrain/Textures/CherryPetalsSheet_T_A.png.meta
+++ b/Assets/Scenes/Garden/Art/Terrain/Textures/CherryPetalsSheet_T_A.png.meta
@@ -3,7 +3,7 @@ guid: 2b822baaa6fd9eb43ad1b9ad8c229f71
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -57,8 +57,8 @@ TextureImporter:
   textureType: 0
   textureShape: 1
   singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
+  flipbookRows: 2
+  flipbookColumns: 2
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
@@ -77,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -89,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -113,6 +116,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -125,6 +129,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/Garden/Art/Terrain/Textures/GardenGround_T_H.png.meta b/Assets/Scenes/Garden/Art/Terrain/Textures/GardenGround_T_H.png.meta
index 47012a6..0e7c1fc 100644
--- a/Assets/Scenes/Garden/Art/Terrain/Textures/GardenGround_T_H.png.meta
+++ b/Assets/Scenes/Garden/Art/Terrain/Textures/GardenGround_T_H.png.meta
@@ -3,7 +3,7 @@ guid: 5e08faf4c9e76684ab8a1a481f6a3922
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -72,11 +72,12 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 2
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -89,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta
index efdc9e0..028ea7f 100644
--- a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta
+++ b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_H.png.meta
@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
diff --git a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_Mask.png.meta b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_Mask.png.meta
index 1eff252..5d14436 100644
--- a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_Mask.png.meta
+++ b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_01_T_Mask.png.meta
@@ -3,11 +3,11 @@ guid: 9b4e4b5b426f4db439897a2e39cf9c55
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -72,11 +72,12 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 2
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -89,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_02_T_A.png.meta b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_02_T_A.png.meta
index 3493a59..115535a 100644
--- a/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_02_T_A.png.meta
+++ b/Assets/Scenes/Garden/Art/Terrain/Textures/Grass_02_T_A.png.meta
@@ -3,7 +3,7 @@ guid: ea2e14fa369ba674aaa689e56d90fd60
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -69,7 +69,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -77,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -89,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -113,6 +116,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -125,6 +129,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/Garden/Art/Terrain/Textures/StoneWalkway_01_T_N.png.meta b/Assets/Scenes/Garden/Art/Terrain/Textures/StoneWalkway_01_T_N.png.meta
index ab5b0eb..c446dcd 100644
--- a/Assets/Scenes/Garden/Art/Terrain/Textures/StoneWalkway_01_T_N.png.meta
+++ b/Assets/Scenes/Garden/Art/Terrain/Textures/StoneWalkway_01_T_N.png.meta
@@ -3,7 +3,7 @@ guid: a5bfb97ceb81b244cb97df741fe3953c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -71,24 +71,26 @@ TextureImporter:
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 4
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 12
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/Garden/GardenScene.unity b/Assets/Scenes/Garden/GardenScene.unity
index d5efba7..2865b85 100644
--- a/Assets/Scenes/Garden/GardenScene.unity
+++ b/Assets/Scenes/Garden/GardenScene.unity
@@ -96,7 +96,7 @@ LightmapSettings:
     m_ExportTrainingData: 0
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 112000000, guid: 4c499845f447c484fb847ad545b279b9, type: 2}
+  m_LightingDataAsset: {fileID: 0}
   m_LightingSettings: {fileID: 4890085278179872738, guid: 0d0c0e1fb12268e4094fa8a75a88fbd1, type: 2}
 --- !u!196 &4
 NavMeshSettings:
@@ -26140,6 +26140,103 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 850090352428292972, guid: 510f46f3a0879db4fb039379b00019ac, type: 3}
   m_PrefabInstance: {fileID: 448743528}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &455698360
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 455698361}
+  - component: {fileID: 455698363}
+  - component: {fileID: 455698362}
+  - component: {fileID: 455698364}
+  m_Layer: 0
+  m_Name: Stone_Walkway_03_LOD0 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 126
+  m_IsActive: 1
+--- !u!4 &455698361
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455698360}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.9393464, y: -0.016844312, z: -0.3424226, w: -0.009562336}
+  m_LocalPosition: {x: 0.47, y: 0, z: 0.077}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 540395121}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &455698362
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455698360}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 679e6d490695427429475fbb1c3d4a41, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 536985543}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &455698363
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455698360}
+  m_Mesh: {fileID: 3664227133476954094, guid: 8694e03786ace84448d95abe2c203df9, type: 3}
+--- !u!114 &455698364
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455698360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a8f562490b8d41b47a6b21e2f514d782, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  transform: {fileID: 0}
 --- !u!1001 &459277921
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -29638,6 +29735,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 850090352428292972, guid: 510f46f3a0879db4fb039379b00019ac, type: 3}
   m_PrefabInstance: {fileID: 536985541}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &536985543 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 778818562828697793, guid: 510f46f3a0879db4fb039379b00019ac, type: 3}
+  m_PrefabInstance: {fileID: 536985541}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &537383128
 GameObject:
   m_ObjectHideFlags: 0
@@ -29909,6 +30011,39 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 5745342502191006184, guid: 3e945be391045ae46bcffd66163af7cf, type: 3}
   m_PrefabInstance: {fileID: 538569573}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &540395120
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 540395121}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &540395121
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 540395120}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -16.072124, y: 1.4, z: 75.99683}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 671925056}
+  - {fileID: 455698361}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &540501040
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -30761,6 +30896,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5746959808393157105, guid: 219931e2e864deb4fbe455ce8da6f5a5, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -37627,6 +37766,93 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8779200753875324562, guid: 3842f68affde3454ea9ec2e33b16dda0, type: 3}
   m_PrefabInstance: {fileID: 670155465}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &671925055
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 540395121}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.435
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.525
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.672
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.00000086426724
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 679e6d490695427429475fbb1c3d4a41, type: 2}
+    - target: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_Name
+      value: Tatami_200x100_02_Mesh (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 2147483647
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 671925058}
+  m_SourcePrefab: {fileID: 100100000, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+--- !u!4 &671925056 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+  m_PrefabInstance: {fileID: 671925055}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &671925057 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+  m_PrefabInstance: {fileID: 671925055}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &671925058
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 671925057}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a8f562490b8d41b47a6b21e2f514d782, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  transform: {fileID: 0}
 --- !u!1001 &672159305
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -59469,6 +59695,93 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3094322270465151314, guid: 71418bea553194f4d8c3ec9179bbc437, type: 3}
   m_PrefabInstance: {fileID: 1082713594}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1084083759
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1114457523}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.435
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.525
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.672
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.00000086426724
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 19ec4ad90cd554248892593afea337c9, type: 2}
+    - target: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_Name
+      value: Tatami_200x100_02_Mesh (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 2147483647
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1084083762}
+  m_SourcePrefab: {fileID: 100100000, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+--- !u!4 &1084083760 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+  m_PrefabInstance: {fileID: 1084083759}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1084083761 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7e4c5b8e69116ee4ea5a82af369f63a7, type: 3}
+  m_PrefabInstance: {fileID: 1084083759}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1084083762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1084083761}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a8f562490b8d41b47a6b21e2f514d782, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  transform: {fileID: 0}
 --- !u!1001 &1085224720
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -61351,6 +61664,39 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2935755031601085468, guid: fa21c78222ed22140afacbdac3c0f43a, type: 3}
   m_PrefabInstance: {fileID: 1113829503}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1114457522
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1114457523}
+  m_Layer: 0
+  m_Name: GameObject (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1114457523
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1114457522}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -16.072124, y: 1.4, z: 77.741}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1084083760}
+  - {fileID: 1299548402}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1115071776
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -71051,6 +71397,103 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1543855012373510215, guid: 10dc08df9d35af0438759cd8981887db, type: 3}
   m_PrefabInstance: {fileID: 1294275511}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1299548401
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1299548402}
+  - component: {fileID: 1299548405}
+  - component: {fileID: 1299548404}
+  - component: {fileID: 1299548403}
+  m_Layer: 0
+  m_Name: Stone_Walkway_03_LOD0 (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 126
+  m_IsActive: 1
+--- !u!4 &1299548402
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1299548401}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.9393464, y: -0.016844312, z: -0.3424226, w: -0.009562336}
+  m_LocalPosition: {x: 0.47, y: 0, z: 0.077}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1114457523}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1299548403
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1299548401}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a8f562490b8d41b47a6b21e2f514d782, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  transform: {fileID: 0}
+--- !u!23 &1299548404
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1299548401}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 19ec4ad90cd554248892593afea337c9, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 536985543}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1299548405
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1299548401}
+  m_Mesh: {fileID: 3664227133476954094, guid: 8694e03786ace84448d95abe2c203df9, type: 3}
 --- !u!1001 &1299703204
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -89828,71 +90271,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3222786974498240390, guid: e4f829552ff027340afbaed5e87ba9d9, type: 3}
   m_PrefabInstance: {fileID: 1636801640}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1642142997
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -17.24971
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.95578253
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 73.25475
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -6126673751231732936, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 76a063ea2cf7334499992b59e33a81de, type: 2}
-    - target: {fileID: 919132149155446097, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_Name
-      value: JM_WuJian_TianChuang003
-      objectReference: {fileID: 0}
-    - target: {fileID: 5504113258885105547, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 0de700f626a08c44091a03511a8d7388, type: 3}
 --- !u!1001 &1642665822
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -120730,4 +121108,5 @@ SceneRoots:
   - {fileID: 966895463892816108}
   - {fileID: 226723377}
   - {fileID: 1996431148}
-  - {fileID: 1642142997}
+  - {fileID: 540395121}
+  - {fileID: 1114457523}
diff --git a/Assets/Scenes/Garden/GardenScene/LightingData.asset b/Assets/Scenes/Garden/GardenScene/LightingData.asset
deleted file mode 100644
index 4ced00b..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/LightingData.asset and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_dir.png b/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_dir.png
deleted file mode 100644
index 2229d59..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_dir.png and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_light.exr b/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_light.exr
deleted file mode 100644
index 04e9f11..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_light.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_shadowmask.png b/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_shadowmask.png
deleted file mode 100644
index b1fd8f5..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_shadowmask.png and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_dir.png b/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_dir.png
deleted file mode 100644
index 753345d..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_dir.png and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_light.exr b/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_light.exr
deleted file mode 100644
index 94378d5..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_light.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_light.exr.meta
deleted file mode 100644
index 091f69a..0000000
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_light.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 353fcc3a706eec341b9821174e839899
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 1
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 6
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_shadowmask.png b/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_shadowmask.png
deleted file mode 100644
index 60ef2dd..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_shadowmask.png and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_shadowmask.png.meta b/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_shadowmask.png.meta
deleted file mode 100644
index 9d6d8e0..0000000
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_shadowmask.png.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 52f2378762042a042a3d4f0f1130e3d4
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 0
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 1
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 11
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_dir.png b/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_dir.png
deleted file mode 100644
index feef4db..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_dir.png and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_light.exr b/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_light.exr
deleted file mode 100644
index 1e450dc..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_light.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_light.exr.meta b/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_light.exr.meta
deleted file mode 100644
index 2e70762..0000000
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_light.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 98b34922e0ee8ea44a2d4faa62dd7445
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 1
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 6
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_shadowmask.png b/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_shadowmask.png
deleted file mode 100644
index 5cb2e80..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_shadowmask.png and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_shadowmask.png.meta b/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_shadowmask.png.meta
deleted file mode 100644
index e65b2cb..0000000
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_shadowmask.png.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: efd5e1478386bf3499791594f7cb28c7
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 0
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 1
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 3
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 11
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-0.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-0.exr
deleted file mode 100644
index 14f6240..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-0.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-0.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-0.exr.meta
deleted file mode 100644
index 3857c08..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-0.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 1087db84c5910774087483ed7b7c7b80
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-1.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-1.exr
deleted file mode 100644
index 405acb4..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-1.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-1.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-1.exr.meta
deleted file mode 100644
index 4efaef8..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-1.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 98d9ff76453e24f45be4c5847147e9ee
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-2.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-2.exr
deleted file mode 100644
index aff131b..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-2.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-2.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-2.exr.meta
deleted file mode 100644
index ed2d881..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-2.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 63ff5cf9b6bb09541973249004e9fd6b
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-3.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-3.exr
deleted file mode 100644
index 4069e19..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-3.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-3.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-3.exr.meta
deleted file mode 100644
index 7ad1b8f..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-3.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 66670f0510a478f4ebebe9c9e30f4212
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-4.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-4.exr
deleted file mode 100644
index 6becd85..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-4.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-4.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-4.exr.meta
deleted file mode 100644
index 4cea1c5..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-4.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: b8c61dde252a1ae44ab5172aac545598
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-5.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-5.exr
deleted file mode 100644
index 4dd0ef3..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-5.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-5.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-5.exr.meta
deleted file mode 100644
index d528b86..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-5.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 474832940b13e6547916ace39d19b37c
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-6.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-6.exr
deleted file mode 100644
index fed8160..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-6.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-6.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-6.exr.meta
deleted file mode 100644
index 64cd2d7..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-6.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: c2ed1b7e0a1f6bc48b7153d00e2b9961
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-7.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-7.exr
deleted file mode 100644
index 3f22451..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-7.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-7.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-7.exr.meta
deleted file mode 100644
index c9c4fa6..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-7.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 67bddf818ca24174897501b1e8a3a0fa
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-8.exr b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-8.exr
deleted file mode 100644
index c2ad793..0000000
Binary files a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-8.exr and /dev/null differ
diff --git a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-8.exr.meta b/Assets/Scenes/Garden/GardenScene/ReflectionProbe-8.exr.meta
deleted file mode 100644
index 2459efb..0000000
--- a/Assets/Scenes/Garden/GardenScene/ReflectionProbe-8.exr.meta
+++ /dev/null
@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 1f674fba72510434f89d4ad3f439c274
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 1
-  seamlessCubemap: 1
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 2
-    aniso: 0
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 2
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 100
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scenes/Oasis/Art/Environment/Textures/GraininessDustWave_T_N.png.meta b/Assets/Scenes/Oasis/Art/Environment/Textures/GraininessDustWave_T_N.png.meta
index bbc27fa..5573bb1 100644
--- a/Assets/Scenes/Oasis/Art/Environment/Textures/GraininessDustWave_T_N.png.meta
+++ b/Assets/Scenes/Oasis/Art/Environment/Textures/GraininessDustWave_T_N.png.meta
@@ -3,7 +3,7 @@ guid: 789fbaf63b7ed024ab83275e00ef0460
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
diff --git a/Assets/Scenes/Oasis/Art/Environment/Textures/Gravel_01_T_A.png.meta b/Assets/Scenes/Oasis/Art/Environment/Textures/Gravel_01_T_A.png.meta
index ea5044b..0973e46 100644
--- a/Assets/Scenes/Oasis/Art/Environment/Textures/Gravel_01_T_A.png.meta
+++ b/Assets/Scenes/Oasis/Art/Environment/Textures/Gravel_01_T_A.png.meta
@@ -3,7 +3,7 @@ guid: 07a6d0e57a3ecf045a4c126e11857e16
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -77,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -89,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/Oasis/Art/Environment/Textures/Rock_01_T_A.png.meta b/Assets/Scenes/Oasis/Art/Environment/Textures/Rock_01_T_A.png.meta
index a829b8e..645327a 100644
--- a/Assets/Scenes/Oasis/Art/Environment/Textures/Rock_01_T_A.png.meta
+++ b/Assets/Scenes/Oasis/Art/Environment/Textures/Rock_01_T_A.png.meta
@@ -3,7 +3,7 @@ guid: 0fe9d9cf76b17d7439a37e14b9efecec
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -64,7 +64,7 @@ TextureImporter:
   textureFormatSet: 0
   ignorePngGamma: 0
   applyGammaDecoding: 0
-  swizzle: 50462976
+  swizzle: 131328
   cookieLightType: 0
   platformSettings:
   - serializedVersion: 3
@@ -77,6 +77,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -89,6 +90,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
@@ -101,6 +103,7 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
diff --git a/Assets/Scenes/OffsetMap.png b/Assets/Scenes/OffsetMap.png
new file mode 100644
index 0000000..273d9c6
Binary files /dev/null and b/Assets/Scenes/OffsetMap.png differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_dir.png.meta b/Assets/Scenes/OffsetMap.png.meta
similarity index 81%
rename from Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_dir.png.meta
rename to Assets/Scenes/OffsetMap.png.meta
index 29b5abd..cf4ae5e 100644
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-2_comp_dir.png.meta
+++ b/Assets/Scenes/OffsetMap.png.meta
@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: c7ce24e97e8d6e249b68a142048f6c0f
+guid: ccc39ca9faa071349bc978dec1bf4cb0
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
@@ -22,7 +22,7 @@ TextureImporter:
     normalMapFilter: 0
     flipGreenChannel: 0
   isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   ignoreMipmapLimit: 0
@@ -34,8 +34,8 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 1
-    aniso: 3
+    filterMode: 0
+    aniso: 1
     mipBias: 0
     wrapU: 1
     wrapV: 1
@@ -54,7 +54,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 12
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -71,20 +71,7 @@ TextureImporter:
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 19
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -94,7 +81,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
diff --git a/Assets/Scenes/Terminal/Animation/Screen_AnimationController.controller b/Assets/Scenes/Terminal/Animation/Screen_AnimationController.controller
index f439947..3c5d725 100644
--- a/Assets/Scenes/Terminal/Animation/Screen_AnimationController.controller
+++ b/Assets/Scenes/Terminal/Animation/Screen_AnimationController.controller
@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
+%TAG !u! tag:unity3d.com,2011:
 --- !u!1101 &-6744393909673955560
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -89,7 +89,7 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
diff --git a/Assets/Scenes/Test.cs b/Assets/Scenes/Test.cs
index 35a27ce..f8012c4 100644
--- a/Assets/Scenes/Test.cs
+++ b/Assets/Scenes/Test.cs
@@ -1,3 +1,4 @@
+using System;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
 using X.Rendering.Feature;
@@ -216,5 +217,28 @@ public class Test : MonoBehaviour
     {
         Debug.Log("TestBatchMode");
     }
+
+
+    [ContextMenu("ApplyMesh 1")]
+    private void ApplyMesh()
+    {
+        ApplyMesh(1);
+    }
+
+
+    [ContextMenu("ApplyMesh 0")]
+    private void ApplyMesh0()
+    {
+        ApplyMesh(0);
+    }
+
+
+    private void ApplyMesh(byte index)
+    {
+        var mesh = GetComponent<MeshFilter>().sharedMesh;
+        var color = new Color32[mesh.vertexCount];
+        Array.Fill(color, new Color32(index, index, index, index));
+        mesh.colors32 = color;
+    }
 }
 
diff --git a/Assets/Scenes/a.png b/Assets/Scenes/a.png
new file mode 100644
index 0000000..ba0ecea
Binary files /dev/null and b/Assets/Scenes/a.png differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_dir.png.meta b/Assets/Scenes/a.png.meta
similarity index 71%
rename from Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_dir.png.meta
rename to Assets/Scenes/a.png.meta
index 83822ae..26609fb 100644
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-1_comp_dir.png.meta
+++ b/Assets/Scenes/a.png.meta
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 767a0c9fdacd8234faad9e9f22f861a3
+guid: 61c0e3aad5c7bcd4cb5a3b072ce62417
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -12,17 +12,17 @@ TextureImporter:
     fadeOut: 0
     borderMipMap: 0
     mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
+    alphaTestReferenceValue: 0
+    mipMapFadeDistanceStart: 0
+    mipMapFadeDistanceEnd: 0
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: 0.25
+    heightScale: 0
     normalMapFilter: 0
     flipGreenChannel: 0
   isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   ignoreMipmapLimit: 0
@@ -30,31 +30,31 @@ TextureImporter:
   generateCubemap: 6
   cubemapConvolution: 0
   seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
+  textureFormat: 0
+  maxTextureSize: 0
   textureSettings:
     serializedVersion: 2
     filterMode: 1
-    aniso: 3
+    aniso: 0
     mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
-  compressionQuality: 50
+  compressionQuality: 0
   spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteExtrude: 0
+  spriteMeshType: 0
   alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 0.001
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 12
+  spriteTessellationDetail: 0
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -72,19 +72,6 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -94,7 +81,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
diff --git a/Assets/Scenes/arrao.png b/Assets/Scenes/arrao.png
new file mode 100644
index 0000000..603e793
Binary files /dev/null and b/Assets/Scenes/arrao.png differ
diff --git a/Assets/Scenes/arrao.png.meta b/Assets/Scenes/arrao.png.meta
new file mode 100644
index 0000000..edc545b
--- /dev/null
+++ b/Assets/Scenes/arrao.png.meta
@@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: bc54459c3b598604b9c5a09f4394f985
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0
+    mipMapFadeDistanceStart: 0
+    mipMapFadeDistanceEnd: 0
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 0
+  maxTextureSize: 0
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 0
+  spriteMode: 0
+  spriteExtrude: 0
+  spriteMeshType: 0
+  alignment: 0
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 0.001
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: 0
+  textureType: 0
+  textureShape: 4
+  singleChannelComponent: 0
+  flipbookRows: 2
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/arrm.png b/Assets/Scenes/arrm.png
new file mode 100644
index 0000000..603e793
Binary files /dev/null and b/Assets/Scenes/arrm.png differ
diff --git a/Assets/Scenes/arrm.png.meta b/Assets/Scenes/arrm.png.meta
new file mode 100644
index 0000000..486cba2
--- /dev/null
+++ b/Assets/Scenes/arrm.png.meta
@@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: ae2eeefc3357ce548a81dd1d931413bf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0
+    mipMapFadeDistanceStart: 0
+    mipMapFadeDistanceEnd: 0
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 0
+  maxTextureSize: 0
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 0
+  spriteMode: 0
+  spriteExtrude: 0
+  spriteMeshType: 0
+  alignment: 0
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 0.001
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: 0
+  textureType: 0
+  textureShape: 4
+  singleChannelComponent: 0
+  flipbookRows: 2
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/arrn.png b/Assets/Scenes/arrn.png
new file mode 100644
index 0000000..8fe884e
Binary files /dev/null and b/Assets/Scenes/arrn.png differ
diff --git a/Assets/Scenes/arrn.png.meta b/Assets/Scenes/arrn.png.meta
new file mode 100644
index 0000000..10d3688
--- /dev/null
+++ b/Assets/Scenes/arrn.png.meta
@@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: 09dc3531888d01d40b256d2c9a2f8d66
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0
+    mipMapFadeDistanceStart: 0
+    mipMapFadeDistanceEnd: 0
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 0
+  maxTextureSize: 0
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 0
+  spriteMode: 0
+  spriteExtrude: 0
+  spriteMeshType: 0
+  alignment: 0
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 0.001
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: 0
+  textureType: 1
+  textureShape: 4
+  singleChannelComponent: 0
+  flipbookRows: 2
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 12
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scenes/mask.png b/Assets/Scenes/mask.png
new file mode 100644
index 0000000..23deeaa
Binary files /dev/null and b/Assets/Scenes/mask.png differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/mask.png.meta
similarity index 71%
rename from Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_dir.png.meta
rename to Assets/Scenes/mask.png.meta
index 9e6973d..b841ba3 100644
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_dir.png.meta
+++ b/Assets/Scenes/mask.png.meta
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: fb6e3533c06b28c4ab2e8c67b7d37160
+guid: ff4f3681a7495974b9475e47d0559608
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -12,17 +12,17 @@ TextureImporter:
     fadeOut: 0
     borderMipMap: 0
     mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
+    alphaTestReferenceValue: 0
+    mipMapFadeDistanceStart: 0
+    mipMapFadeDistanceEnd: 0
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: 0.25
+    heightScale: 0
     normalMapFilter: 0
     flipGreenChannel: 0
   isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   ignoreMipmapLimit: 0
@@ -30,31 +30,31 @@ TextureImporter:
   generateCubemap: 6
   cubemapConvolution: 0
   seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
+  textureFormat: 0
+  maxTextureSize: 0
   textureSettings:
     serializedVersion: 2
     filterMode: 1
-    aniso: 3
+    aniso: 0
     mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
-  compressionQuality: 50
+  compressionQuality: 0
   spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteExtrude: 0
+  spriteMeshType: 0
   alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 0.001
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
   alphaUsage: 1
   alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 12
+  spriteTessellationDetail: 0
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -72,19 +72,6 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -94,7 +81,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
diff --git a/Assets/Scenes/n.png b/Assets/Scenes/n.png
new file mode 100644
index 0000000..890c760
Binary files /dev/null and b/Assets/Scenes/n.png differ
diff --git a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_shadowmask.png.meta b/Assets/Scenes/n.png.meta
similarity index 71%
rename from Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_shadowmask.png.meta
rename to Assets/Scenes/n.png.meta
index 83a4422..a954a70 100644
--- a/Assets/Scenes/Garden/GardenScene/Lightmap-0_comp_shadowmask.png.meta
+++ b/Assets/Scenes/n.png.meta
@@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: b85a2f4df0f574e4ea3d5171115c035f
+guid: 6572f548082a595459f1531424a252f4
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 12
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -12,17 +12,17 @@ TextureImporter:
     fadeOut: 0
     borderMipMap: 0
     mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
+    alphaTestReferenceValue: 0
+    mipMapFadeDistanceStart: 0
+    mipMapFadeDistanceEnd: 0
   bumpmap:
     convertToNormalMap: 0
     externalNormalMap: 0
-    heightScale: 0.25
+    heightScale: 0
     normalMapFilter: 0
     flipGreenChannel: 0
   isReadable: 0
-  streamingMipmaps: 1
+  streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
   ignoreMipmapLimit: 0
@@ -30,31 +30,31 @@ TextureImporter:
   generateCubemap: 6
   cubemapConvolution: 0
   seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
+  textureFormat: 0
+  maxTextureSize: 0
   textureSettings:
     serializedVersion: 2
     filterMode: 1
-    aniso: 3
+    aniso: 0
     mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
-  compressionQuality: 50
+  compressionQuality: 0
   spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
+  spriteExtrude: 0
+  spriteMeshType: 0
   alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 0.001
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
   alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 11
+  spriteTessellationDetail: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -72,19 +72,6 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
@@ -94,7 +81,7 @@ TextureImporter:
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
-    buildTarget: Server
+    buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
diff --git a/Assets/Scenes/testarr.png b/Assets/Scenes/testarr.png
new file mode 100644
index 0000000..86c6d3f
Binary files /dev/null and b/Assets/Scenes/testarr.png differ
diff --git a/Assets/Scenes/testarr.png.meta b/Assets/Scenes/testarr.png.meta
new file mode 100644
index 0000000..9028199
--- /dev/null
+++ b/Assets/Scenes/testarr.png.meta
@@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: 81bf274a1ba706c4ca7180b74f0e6573
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0
+    mipMapFadeDistanceStart: 0
+    mipMapFadeDistanceEnd: 0
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 0
+  maxTextureSize: 0
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 0
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 0
+  spriteMode: 0
+  spriteExtrude: 0
+  spriteMeshType: 0
+  alignment: 0
+  spritePivot: {x: 0, y: 0}
+  spritePixelsToUnits: 0.001
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 0
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: 0
+  textureType: 0
+  textureShape: 4
+  singleChannelComponent: 0
+  flipbookRows: 2
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/ProfilerHelper.cs b/Assets/Scripts/ProfilerHelper.cs
new file mode 100644
index 0000000..57860b7
--- /dev/null
+++ b/Assets/Scripts/ProfilerHelper.cs
@@ -0,0 +1,33 @@
+using System;
+using UnityEditor;
+using UnityEditorInternal;
+using UnityEngine;
+
+namespace X.Profiler
+{
+    internal class ProfilerHelper
+    {
+        static ProfilerHelper()
+        {
+
+        }
+
+        [MenuItem("Tools/Performance/Profiler/转 csv")]
+        public static void ProfileFile2CSV()
+        {
+
+            var path = EditorUtility.OpenFilePanel("打开 profiler 数据", "", "raw");
+            if (string.IsNullOrEmpty(path))
+            {
+                return;
+            }
+
+            if(!ProfilerDriver.LoadProfile(path, false))
+            {
+                Debug.LogError($"open profiler {path} failure.");
+                return;
+            }
+            
+        }
+    }
+}
diff --git a/Assets/Scripts/ProfilerHelper.cs.meta b/Assets/Scripts/ProfilerHelper.cs.meta
new file mode 100644
index 0000000..d581650
--- /dev/null
+++ b/Assets/Scripts/ProfilerHelper.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e08411cce60c1f84cb02675d22fa8038
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/TweenPath.cs b/Assets/Scripts/TweenPath.cs
new file mode 100644
index 0000000..fd87615
--- /dev/null
+++ b/Assets/Scripts/TweenPath.cs
@@ -0,0 +1,157 @@
+using Cinemachine;
+using System;
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+namespace TweenAnimation
+{
+    public enum ETweenType
+    {
+        Once,
+        Looped,
+        PingPong
+    }
+
+    [RequireComponent(typeof(CinemachineSmoothPath)), ExecuteAlways]
+    public class TweenPath : MonoBehaviour
+    {
+        [Serializable]
+        public class TweenTarget
+        {
+            public Transform transform;
+            public float startPos;
+        }
+
+        [SerializeReference]
+        public TweenTarget[] targets;
+
+        [SerializeField]
+        public CinemachineSmoothPath path;
+
+        [SerializeField, HideInInspector]
+        private Transform minStarPosTransform;
+
+        [SerializeField]
+        public ETweenType TweenType;
+
+        [Min(0.1f)] public float Duration = 1;
+        [Min(0)] public float Delay = 0;
+        [SerializeField]
+        public AnimationCurve speedCurve = AnimationCurve.Linear(0, 0, 1, 1);
+
+        private float playTime = 0;
+        private bool isPlaying = false;
+
+#if UNITY_EDITOR
+        public bool isEditing = false;
+#endif
+
+        private void Awake()
+        {
+#if UNITY_EDITOR
+            path ??= GetComponent<CinemachineSmoothPath>();
+#endif
+        }
+
+        private void Start()
+        {
+#if UNITY_EDITOR
+            if (!Application.isPlaying)
+            {
+                return;
+            }
+#endif
+            Play();
+        }
+
+#if UNITY_EDITOR
+        [ContextMenu("Play")]
+#endif
+        public void Play()
+        {
+            isPlaying = true;
+            playTime = 0;
+        }
+
+#if UNITY_EDITOR
+        [ContextMenu("Stop")]
+#endif
+        public void Stop()
+        {
+            isPlaying = false;
+            playTime = 0;
+        }
+
+        private void Update()
+        {
+#if UNITY_EDITOR
+            if (targets == null)
+            {
+                return;
+            }
+            if (!isEditing && !isPlaying && !Application.isPlaying)
+            {
+                float minStartPos = 10;
+                for (int i = 0; i < targets.Length; i++)
+                {
+                    var target = targets[i];
+                    EvaluatePosition(target.transform, target.startPos);
+                    if (target.startPos < minStartPos)
+                    {
+                        minStartPos = target.startPos;
+                        minStarPosTransform = target.transform;
+                    }
+                }
+            }
+#endif
+            if (!isPlaying)
+            {
+                return;
+            }
+
+            playTime += Time.smoothDeltaTime;
+            if (playTime < Delay)
+            {
+                return;
+            }
+            for (int i = 0; i < targets.Length; i++)
+            {
+                var target = targets[i];
+                var t = (playTime - Delay) / Duration + target.startPos;
+                EvaluatePosition(target.transform, t);
+
+                if (target.transform == minStarPosTransform && TweenType == ETweenType.Once && t >= 1)
+                {
+                    Stop();
+                }
+            }
+
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void EvaluatePosition(Transform transform, float t)
+        {
+            if (TweenType == ETweenType.Looped)
+            {
+                t = t % 1.0f;
+            }
+            else if (TweenType == ETweenType.PingPong)
+            {
+                if (((int)t & 1) == 0)
+                {
+                    t = t % 1.0f;
+                }
+                else
+                {
+                    t = 1f - (t % 1.0f);
+                }
+            }
+
+            var p = speedCurve.Evaluate(t);
+
+            p = p * (path.MaxPos - path.MinPos);
+
+            transform.localPosition = path.EvaluateLocalPosition(p);
+        }
+    }
+}
diff --git a/Assets/Scripts/TweenPath.cs.meta b/Assets/Scripts/TweenPath.cs.meta
new file mode 100644
index 0000000..109a499
--- /dev/null
+++ b/Assets/Scripts/TweenPath.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 43b788e23ad68364d80819046db16b82
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/TweenPathEditor.cs b/Assets/Scripts/TweenPathEditor.cs
new file mode 100644
index 0000000..8c0a24d
--- /dev/null
+++ b/Assets/Scripts/TweenPathEditor.cs
@@ -0,0 +1,200 @@
+#if UNITY_EDITOR
+using System;
+using UnityEditor;
+using UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace TweenAnimation
+{
+    [CustomEditor(typeof(TweenPath))]
+    public class TweenPathEditor : Editor
+    {
+        TweenPath tweenPath;
+        ReorderableList targetsList;
+        int selectIndex = -1;
+        private AnimationCurve inverseSpeedCurve;
+        float startPos = 0f;
+
+        SerializedProperty targetsProp;
+
+        public override VisualElement CreateInspectorGUI()
+        {
+            tweenPath = (target as TweenPath);
+            targetsProp = serializedObject.FindProperty("targets");
+            targetsList = new ReorderableList(serializedObject, targetsProp, true, true, true, true);
+            targetsList.onSelectCallback += (_) =>
+            {
+                if (selectIndex == targetsList.index)
+                {
+                    targetsList.ClearSelection();
+                    selectIndex = -1;
+                }
+                else
+                {
+                    selectIndex = targetsList.index;
+                    var target = tweenPath.targets[selectIndex];
+                    startPos = Time2StartPos(target.startPos);
+                }
+            };
+            targetsList.drawHeaderCallback = DrawHeader;
+
+            targetsList.drawElementCallback = DrawListItems;
+            targetsList.displayAdd = false;
+
+            inverseSpeedCurve = new AnimationCurve();
+            for (int i = 0; i < tweenPath.speedCurve.length; i++)
+            {
+
+                float inWeight = (tweenPath.speedCurve.keys[i].inTangent * tweenPath.speedCurve.keys[i].inWeight);
+                float outWeight = (tweenPath.speedCurve.keys[i].outTangent * tweenPath.speedCurve.keys[i].outWeight);
+
+                Keyframe inverseKey = new Keyframe(tweenPath.speedCurve.keys[i].value, tweenPath.speedCurve.keys[i].time, 1 / tweenPath.speedCurve.keys[i].inTangent, 1 / tweenPath.speedCurve.keys[i].outTangent, inWeight, outWeight);
+
+                inverseSpeedCurve.AddKey(inverseKey);
+            }
+
+            return base.CreateInspectorGUI();
+        }
+
+        private void DrawListItems(Rect rect, int index, bool isActive, bool isFocused)
+        {
+            if (index < 0)
+            {
+                return;
+            }
+
+            EditorGUI.PropertyField(rect, targetsProp.GetArrayElementAtIndex(index).FindPropertyRelative("transform"));
+        }
+
+        private void DrawHeader(Rect rect)
+        {
+            string name = "目标物体";
+            EditorGUI.LabelField(rect, name);
+        }
+
+        private void UpdateTargets()
+        {
+            if (targetsProp.arraySize != tweenPath.transform.childCount)
+            {
+                var tr = tweenPath.transform;
+                if (tweenPath.transform.childCount > targetsProp.arraySize)
+                {
+                    var cnt = tweenPath.transform.childCount - targetsProp.arraySize;
+                    for (int i = 0; i < cnt; i++)
+                    {
+                        targetsProp.InsertArrayElementAtIndex(targetsProp.arraySize);
+                        targetsProp.GetArrayElementAtIndex(targetsProp.arraySize - 1).managedReferenceValue = new TweenPath.TweenTarget();
+                    }
+                }
+                serializedObject.ApplyModifiedProperties();
+
+                for (int i = 0; i < targetsProp.arraySize; i++)
+                {
+                    var target = targetsProp.GetArrayElementAtIndex(i).managedReferenceValue as TweenPath.TweenTarget;
+                    if (target == null)
+                    {
+                        targetsProp.GetArrayElementAtIndex(i).managedReferenceValue = new TweenPath.TweenTarget()
+                        {
+                            transform = tr.GetChild(i),
+                            startPos = 0
+                        };
+                    }
+                    else if (target.transform && target.transform.parent != tweenPath.transform)
+                    {
+                        targetsProp.DeleteArrayElementAtIndex(i);
+                    }
+                    else if (target.transform != tr.GetChild(i))
+                    {
+                        target.transform = tr.GetChild(i);
+                        target.startPos = 0;
+                    }
+                }
+            }
+            else
+            {
+                if (tweenPath.targets == null)
+                {
+                    return;
+                }
+
+                Array.Sort(tweenPath.targets, (a, b) =>
+                {
+                    var ai = 0;
+                    var bi = 0;
+                    for (int i = 0; i < tweenPath.transform.childCount; i++)
+                    {
+                        if (tweenPath.transform.GetChild(i) == a.transform)
+                        {
+                            ai = i;
+                        }
+                        if (tweenPath.transform.GetChild(i) == b.transform)
+                        {
+                            bi = i;
+                        }
+                    }
+
+                    return ai.CompareTo(bi);
+                });
+
+            }
+
+            serializedObject.ApplyModifiedProperties();
+        }
+
+        public override void OnInspectorGUI()
+        {
+            serializedObject.Update();
+            UpdateTargets();
+
+            base.OnInspectorGUI();
+            targetsList.DoLayoutList();
+            serializedObject.ApplyModifiedProperties();
+        }
+
+        public void OnSceneGUI()
+        {
+            if (selectIndex == -1)
+            {
+                tweenPath.isEditing = false;
+                Tools.hidden = false;
+                return;
+            }
+            Tools.hidden = true;
+            tweenPath.isEditing = true;
+            DrawSelectHandle();
+        }
+
+
+        private void DrawSelectHandle()
+        {
+            var target = tweenPath.targets[selectIndex];
+
+            target.transform.localPosition = tweenPath.path.EvaluateLocalPosition(startPos);
+            var newPos = Handles.PositionHandle(target.transform.position, Quaternion.identity);
+            startPos = tweenPath.path.FindClosestPoint(newPos, 0, 1, 1000);
+
+            target.startPos = StartPos2Time(startPos);
+        }
+
+        private float Time2StartPos(float t)
+        {
+            var p = tweenPath.speedCurve.Evaluate(t);
+            p = p * (tweenPath.path.MaxPos - tweenPath.path.MinPos);
+            return p;
+        }
+
+        private float StartPos2Time(float pos)
+        {
+            var t = pos / (tweenPath.path.MaxPos - tweenPath.path.MinPos);
+            t = inverseSpeedCurve.Evaluate(t);
+            return t;
+        }
+
+        private void OnDestroy()
+        {
+            Tools.hidden = false;
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/Assets/Scripts/TweenPathEditor.cs.meta b/Assets/Scripts/TweenPathEditor.cs.meta
new file mode 100644
index 0000000..433a261
--- /dev/null
+++ b/Assets/Scripts/TweenPathEditor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 29df40bf86cfcaf489bedc4772fff061
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/UIImageAlphaMask.cs b/Assets/Scripts/UIImageAlphaMask.cs
index 7dae03f..014ac7d 100644
--- a/Assets/Scripts/UIImageAlphaMask.cs
+++ b/Assets/Scripts/UIImageAlphaMask.cs
@@ -13,7 +13,7 @@ public class UIImageAlphaMask : MonoBehaviour
     [SerializeField, HideInInspector]
     private Image[] targetImageList;
 
-    [SerializeField]
+    [SerializeField, Tooltip("需要保证 mask 图边缘预留 1-2 像素空白")]
     public Texture2D MaskTex;
 
     private Canvas RootCanvas
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/.attestation.p7m b/Packages/com.unity.performance.profile-analyzer@1.2.4/.attestation.p7m
new file mode 100644
index 0000000..3d896ca
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/.attestation.p7m differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/.buginfo b/Packages/com.unity.performance.profile-analyzer@1.2.4/.buginfo
new file mode 100644
index 0000000..84d8030
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/.buginfo
@@ -0,0 +1,5 @@
+system: jira
+server: jira.unity3d.com
+issuetype: Bug
+package: Profile Analyzer
+project: PROFB
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/.gitattributes b/Packages/com.unity.performance.profile-analyzer@1.2.4/.gitattributes
new file mode 100644
index 0000000..3a4831b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/.gitattributes
@@ -0,0 +1,5 @@
+*.md eol=lf
+*.cs eol=lf
+*.json eol=lf
+*.meta eol=lf
+*.scene eol=lf
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/.signature b/Packages/com.unity.performance.profile-analyzer@1.2.4/.signature
new file mode 100644
index 0000000..31da10b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/.signature
@@ -0,0 +1 @@
+{"timestamp":1734351130,"signature":"MkbM2CSQSNjs0BFgGv54Ujz/F8Yl1DUisQpHHeiDz0byvU23rXPxco0Yk4tq3g1crYZsQXvLq4/A77i6s+YManhIsldFQjpMe/iVGe2cWVt1xRwKdu84Cu76JS3JHfXNH5/SI0vIal0OHzwJnmQdavF2YLd69rklw2LXucbRbq268gMPyEezgiujCuY8Qze/vRBsKUQEJHeZeVbQNOoOMN465fIN5Ks4yjKi9V7x41yuUmzQypVvhog0bzUyGWOSMVUjjrwqZd8wxc9cVEuGVqEsezzxMj7rqnPl7KhQmYjotWuVwnwRpRBxy15KajywlNQJ7wjYzKwvoBrIIzzW0nepLO5JX6ugDkIOK/8kLVhpYXEuRuLVbx9VjU4TNnw52hvdVRgPxR2ZvJ2/lUSp4AugbZolxLgLf0p1upKr1/ij19mCLk05J5kxIycOKBDfhCTwl2EOtOvsYOEQz2XaWWS457FjQFvd3VkfO0uyr2Gnlk21CmTMhnHBjo4QcFZX","publicKey":"LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQm9qQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FZOEFNSUlCaWdLQ0FZRUFzdUhXYUhsZ0I1cVF4ZEJjTlJKSAordHR4SmoxcVY1NTdvMlZaRE1XaXhYRVBkRTBEMVFkT1JIRXNSS1RscmplUXlERU83ZlNQS0ZwZ1A3MU5TTnJCCkFHM2NFSU45aHNQVDhOVmllZmdWem5QTkVMenFkVmdEbFhpb2VpUnV6OERKWFgvblpmU1JWKytwbk9ySTRibG4KS0twelJlNW14OTc1SjhxZ1FvRktKT0NNRlpHdkJMR2MxSzZZaEIzOHJFODZCZzgzbUovWjBEYkVmQjBxZm13cgo2ZDVFUXFsd0E5Y3JZT1YyV1VpWXprSnBLNmJZNzRZNmM1TmpBcEFKeGNiaTFOaDlRVEhUcU44N0ZtMDF0R1ZwCjVNd1pXSWZuYVRUemEvTGZLelR5U0pka0tldEZMVGdkYXpMYlpzUEE2aHBSK0FJRTJhc0tLTi84UUk1N3UzU2cKL2xyMnZKS1IvU2l5eEN1Q20vQWJkYnJMbXk0WjlSdm1jMGdpclA4T0lLQWxBRWZ2TzV5Z2hSKy8vd1RpTFlzUQp1SllDM0V2UE16ZGdKUzdGR2FscnFLZzlPTCsxVzROY05yNWdveVdSUUJ0cktKaWlTZEJVWmVxb0RvSUY5NHpCCndGbzJJT1JFdXFqcU51M3diMWZIM3p1dGdtalFra3IxVjJhd3hmcExLWlROQWdNQkFBRT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg"}
\ No newline at end of file
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/CHANGELOG.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/CHANGELOG.md
new file mode 100644
index 0000000..df95dca
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/CHANGELOG.md
@@ -0,0 +1,276 @@
+# Changelog
+All notable changes to this package will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [1.2.3] - 2024-12-13
+
+### Fixed
+
+* Fixed minimum supported version in documentation.
+* Fixed PROFB-199; Unchecking 'Hide Removed Markers' doesn't work.
+
+## [1.2.2] - 2023-01-30
+
+### Fixed
+
+* Fixed exception thrown when removing marker.
+
+## [1.2.1] - 2023-01-02
+
+### Changed
+
+* Updated What's New page
+
+## [1.2.0] - 2023-01-02
+
+### Added 
+
+* Added support for removing vsync time, so we can see actual CPU duration over multiple frames. A drop down has been added to 'remove' a marker from the analysis and has entries for "FPS Wait", "Present Wait" and "Custom" where you can select any marker from the table using the right click context menu to "Remove Marker".
+* Added optional standard deviation (SD) column into marker table (on single view) for sorting data based on variation of marker timings in over the frames.
+* Added export of the comparison table as CSV.
+
+### Changed
+
+* Improved profile analysis performance.
+* Updated minimal suppourted version to Unity 2020.3.
+
+### Fixed
+
+* Fixed bug when depth filter and marker vsync removal both applied.
+* Fixed commas in CSV export file.
+
+## [1.1.1] - 2021-10-04
+
+### Fixed
+* Fixed pulling frame data from the Profiler to exclude first and last frames if their main thread profiler data is incomplete, so that they don't skewer the analysis results [(case 1359686)](https://issuetracker.unity3d.com/product/unity/issues/guid/1359686/).
+* Fixed IndexOutOfRangeException thrown when using Profiler or selecting Profiler frames in Profile Analyzer. [(1366931)](https://issuetracker.unity3d.com/product/unity/issues/guid/1366931/)
+
+## [1.1.0] - 2021-07-23
+
+### Fixed
+
+* Fixed x axis display on frame time graph when capture doesn't match Unity Profiler contents.
+* Fixed selected marker name to be updated even when Profiler fails to sync selection.
+
+## [1.1.0-pre.2] - 2021-04-16
+
+### Changed
+
+* Ensured forward compilation compatibility of ProfilerWindow API usage.
+
+### Fixed
+
+* Fixed Frame View Dropdown not showing time in Microseconds when Microseconds are set as display unit type.
+* Fixed ArgurmentOutOfRange exception on 'Clear Selection' usage in Frame Control.
+* Improved loading and analysis progressbar progression to be monotonously incremental and reflect actual stage correctly.
+* Fixed the marked frame time overlay so that it works on loaded data (case 1327888).
+* Fixed keyboard frame controls so that they do not play an error sound (case 1327931).
+* Fixed RangeSettings.IsEqual so that it doesn't throw an exception when there is a different dataView.selectedIndices.
+
+## [1.1.0-pre.1] - 2021-02-22
+
+### Changed
+
+* Used the new `EditorWindow.docked` API on 2020.1 and later to replace reflection usage.  
+* Made the **Thread Selection** window a utility window.
+* Added a progress bar, which shows data loading progress.
+* **All** no longer collapses in the thread view because it was superfluous and held no discernible purpose.
+* Added information to the frame summary tooltip to show the selected ranges.
+* Selecting the **Frame**, **Thread**, and **Marker Summary** title labels now also toggles their foldout.
+* Timings in tooltips now display up to seven digits with a unit type change if below 0.01. This ensures the value is readable and correct.
+* Frame Time Graph selection modifiers (Next, Previous, Grow, Shrink etc.) now work when multiple regions are selected.
+* Added new (hidden) columns to the comparison tab for **Percentage Diff** for each of the diff types
+* The **Depth Slice** drop-down is searchable and scrollable for Unity versions 2019.1 or newer.
+* Improved tooltips on the top 10 marker duration time.
+
+### Fixed
+
+* The Thread Summary and Marker Summary views now correctly clip their contents when scrolling on 2018.4 and below.
+* Marker detail bars are no longer drawn on top of the list's headers when scrolling.
+* Fixed an issue with saving when there is no data loaded, which previously caused a null reference exception.
+* **Add to** and **Remove from** name filter is no longer case sensitive.
+* Optimized frame selection with **Show Filtered Threads** option enabled and **All Threads** turned on.
+* Fixed an issue where the **Upper Quartile of frame time** option did not fit in the Graph scale dropdown in **Thread Summary**.
+* Improved the error message when the Profile Analyzer fails to load a .data file.
+* Fixed an issue where changing the depth slice and right-clicking on a marker caused an error in 2018.4 and earlier.
+* Fixed the automatic increase of an unsaved file counter in Single view.
+* Improved the Marker Column mode so that it is separate for Single and Compare view.
+* The tooltip of the frame graph's scale control is now clearer and matches the documentation.
+* Fixed an issue where a frame of '0' was incorrectly shown in the **Marker Summary** when the marker had a duration of 0ms.
+* Fixed an issue with **Selection Synchronization** between Profiler Window and Profile Analyzer in Unity 2021.1 or newer.
+* Added a log message when the loading or analysis fails due to domain reload.
+* Fixed an issue with the table context menu, where it was not disabled during data processing.
+* Fixed an issue where exporting a marker table that contained markers with commas or quotation marks to the .csv format would break the format.
+
+## [1.0.3] - 2020-07-31
+
+### Fixes
+
+* Fixed warnings in code so package will not break Unity projects that have warnings as errors enabled.
+
+## [1.0.2] - 2020-06-30
+
+### Fixes
+
+* Fixed issue where second profiler instance could appear after entering play mode when profile analyzer is open
+* Improved performance of pulling data from Unity profiler
+* Pull Data button now enabled when profiler is recording. This will stop the recording for the duration of the action of pulling of data.
+* Fixed Median sorting in Comparison mode when value missing from one data set, Missing values always sorted before 0 values.
+
+## [1.0.1] - 2020-06-16
+
+### Fixes
+
+* Fixed "median marker time (in currently selected frames)" in tooltip for 'Top 10 markers'. 
+* Fixed profile analyzer 5.6 support
+* Fixed minor visual artefact when no marker selection 
+* Fixed issue where frame time graph tooltips were not always appearing when hovering
+* Marker Summary - Count Values are now correctly sorted in descending order
+* Hiding selected marker in comparison view if lacking 2 valid data sets
+* Corrected bucketing of histogram data for counts. Display was fractionally incorrect
+* Fixed sorting of frames (by time/count) to be more stable by providing a secondary sort by frame index
+* Marker table export now orders by descending median time (to match the default UI sort option).
+
+## [1.0.0] - 2020-06-02
+
+### Changes
+* Export window updates. Includes tooltips, better on screen positioning. 
+  * If opened and then new data set loaded. New data set now correctly exported.
+* Frame Time graph now shows border when selected
+  * Keys 1 and 2 select the first or second frame time graph to take keyboard focus
+* Frame Time graph now shows highlighted when all frames selected, un highlighted when no frames selected.
+
+### Fixes
+* Improved histogram display when 0 range.
+* Widened frame index buttons when frame value large
+* 'total number of markers' value in Compare tab now corrected to use unfiltered count
+* Improved error messages when jumpping to frame when profiler data doesn't match profile analyzer data
+
+## [0.7.0-preview.4] - 2020-05-29
+
+### Changes
+* Thread selection window 
+  * Now only applys thread selection changes when clicking 'Apply'. Closing the window no longer applies the changes automatically.
+  * Now contains buttons to Reset to previous thread selection, Select just "Main Thread" or "Common" set selection (Main, Render and Jobs).
+  * Apply button is now greyed out while analysis is running.
+  * Group column enabled and used to split off group from thread name, default to by group first
+  * Re sorted when selection changed (so states sort correctly when sorting by state)
+  * Sort order preserved when buttons pressed and re-opening
+  * Fixed sort order for threads (10 after 9 rather than between 1 and 2)
+* Marker sorting
+  * Marker table column filtering now preserved when clicking Analyse or Compare or tab switching.
+  * Compare table bars to now sort by bar size (=delta value) rather than the left/right value.
+  * Marker table bars now start sorted by descending size which is more common usage.
+* Added depths columns into the comparison table and a 'Depth' option in the Marker Columns dropdown
+* Added thread count into thread summary area
+* Added threads column into marker tables (threads the marker occurs on)
+* Thread summary now contains thread count, unique count per data set and selection count
+* Frame time area now allows adding to the selection by holding CTRL (or COMMAND on Mac)
+* Frame range value now includes tooltip to give more detail about the selection
+* Improved text string for depth filter status on the top marker display
+
+### Fixes
+* Detected and ignored invalid frame markers (duration < 0)
+* Fixed/Removed warnings on loading data in compare view when selection active.
+* Disabled "Analyze" button while analysis is already running
+* Fixed Marker Summary 'Top' dropdown selection text width
+* Fixed thread selection window sort order
+* Fixed tooltip on 'count' bars to be scalar value (not a time unit)
+* Clamped selected region shown when zoomed in on frame time graph
+* Frame Control value no longer overlaps with drop-down list when Units are set to Microseconds
+* Fixed thread count text when analysis completes after swapping single/compare tabs during analysis
+* Fixed Frame View's tooltip "total time" when rapidly changing frames 
+* Fixed overlapping text when selecting single frame when zoomed in
+* Histogram frame count now lists "1 frame" when single frame rather than "1 frames"
+* Mode: text in top bar now same size as rest of text.
+* Clear Selection in marker right click context menu now only shown if a selection has been made
+* Cut/Paste now supported in the include/exclude marker name filter
+* Frame Time graph frame selection grow/shrink now keeps current selection in paired graph
+* Fixed frame start/end display for "Select Frames that contain this marker (within whole data set)"
+* Corrected bucketing of histogram data. Display was fractionally incorrect
+* Histogram now shows non zero height bar if an item in the bucket
+* Fixed right click "Remove from Included Filters" when using (quoted) markers with spaces in names
+* Fixed data auto-load from Single to Compare tab when capturing after entering playmode
+* Fixed auto right calculation to use most common difference
+* Fixed auto right display to show + or - and not both at the same time
+* Fixed infinite analysis loop when auto right calculation was clamping to max depth in the other data set
+* Auto right now clamps to min/max depth rather than reverting to 'all'
+* Fixed thread count bug when using comparison mode and loading data on top of existing data
+* Selected marker refocused in marker list when table is regenerated (e.g. when selecting all frames containing the marker).
+* Column by which the Marker Details is sorted by is now maintained  when entering Play Mode
+* Updated frame time graph context menu to make hotkeys more consistent with out Unity UI layouts
+* Percent symbol no longer cut off in Mean frame contribution when the value is 100% 
+* Frame time graph now scales up when zooming when comparing data with different frame amounts
+* Changing 'Auto Right' tick box no longer causes re-analysis if depth settings unchanged
+* Most tooltips now show values without rounding, so its more obvious when low values give non zero deltas. 
+* Fixed individual max tooltip
+* Disabled 'Pull data' button when Unity profiler is still capturing data (as the pull would not complete).
+* Fixed right frame index in exported comparison CSV file.
+* Frame selection no longer changed when moving the cursor in the Filter text box with arrow keys
+* Help text now continues to be shown after entering play mode, while no data set loaded/pulled
+* Fixed frame index button heights when alternative (Verdana) font used.
+* Fixed cache styles to be updated when changing theme (to fix text colour in filters area)
+* Single click (without drag) now always single frame rather than the group of frames in the pixel wide area.
+* Split frame range into start and end rows to display more information when values large 
+* Marker Summary comparison times are now limited to 5 digits to prevent text clipping off
+
+### Enhancements
+* Optimised filter processing for more responsive scrolling when a large marker filter list is supplied.
+* Optimised thread name summary display
+
+## [0.6.0-preview.1] - 2020-02-04
+* Fixed a crash with the thread selection API in Unity 2020.1 
+* Fixed marker and thread scroll bars
+* Added extra documentation for public API elements
+
+## [0.5.0-preview.2] - 2019-09-19
+* Minor documentation update to fix the changelog formatting
+
+## [0.5.0-preview.1] - 2019-09-18
+
+### Features 
+* Added self time option to display 'exclusive' time of markers excluding time in children.
+* Added ability to filter to a parent marker to reduce the marker list to a part of the tree.
+* Added option to filter the column list to set groups (including custom).
+* Added column for total marker time over the frame
+* Added copy to clipboard on table entries
+* Added export option for marker table 
+
+### Enhancements
+* Improved Top N Markers graph to make it clearer this is for the median frames of each data set.
+* Added thread count display (next to marker count).
+* Added frame index to more tooltips to improve clarity of the data values (marker table, frame and marker summary).
+* Added additional visual bars for total and count diffs. Added abs count column.
+* Improved performance of adding to include/exclude filter via the right click menu by only refreshing the table (and no longer rerunning full analysis)
+* Improved performance for scrolling by caching strings for profile table and comparison table.
+* Added unaccounted time into the Top N Markers graph when total is less than the median frame time
+* Added grow/shrink selection hot keys and menu options
+* Added tooltip info for frame time duration for selection range
+
+### Fixes
+* Fixed issue with combined marker count when data sets have some unique markers.
+* Fixed bars less than 1 pixel wide to clamp to min width of 1.
+* Fixed help text for new editor skin in 2019.3
+* Fixed bug with calculation of the auto right depth offset (see with 2017.4/2018.4 comparisons)
+* Improved the frame offset times in the frame time and comparison frame time exports
+* Fixed bug with missing first frame of data / frame offset incorrect when reloading .pdata
+
+## [0.4.0-preview.5] - 2019-04-02
+
+* Updated package.json file to indicate this package is valid for all unity versions
+
+## [0.4.0-preview.4] - 2019-04-02
+
+* Fixed issue in 2017.4 with unsupported analytics API and a GUI style.
+
+## [0.4.0-preview.3] - 2019-04-01
+
+* First public release of Profile Analyzer. 
+
+## [0.1.0-preview] - 2018-12-07
+
+* This is the first beta release of Profile Analyzer
+
+The profile analyzer tool augments the standard Unity Profiler. It provides multi frame analysis of the profiling data.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/CHANGELOG.md.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/CHANGELOG.md.meta
new file mode 100644
index 0000000..4db14d7
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/CHANGELOG.md.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 379ad77c12d5940bb8254d679e69d4ce
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/TableOfContents.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/TableOfContents.md
new file mode 100644
index 0000000..346723b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/TableOfContents.md
@@ -0,0 +1,17 @@
+* [About Profile Analyzer](index.md)
+    * [What's new](whats-new.md)
+    * [Upgrade guide](upgrade-guide.md)
+* [Profile Analyzer window](profile-analyzer-window.md)
+    * [Single view](single-view.md)
+    * [Compare view](compare-view.md)
+    * [Frame Control pane](frame-range-selection.md)
+    * [Filters pane](filtering-system.md)
+    * [Frame Summary](frame-summary.md)
+    * [Thread Summary](thread-summary.md)
+    * [Marker Summary](marker-summary.md)
+    * [Statistics in the Profile Analyzer](statistics.md)
+* Workflows
+    * [Collecting and viewing data](collecting-and-viewing-data.md)
+    * [Comparing frames from the same data set](comparing-frames-same-dataset.md)
+    * [Comparing frames from different data sets](analyzing-mulitple-datasets.md)
+    * [Ordering frames by length](ordering-frames-by-cost.md)
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/analyzing-mulitple-datasets.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/analyzing-mulitple-datasets.md
new file mode 100644
index 0000000..f1cc9ef
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/analyzing-mulitple-datasets.md
@@ -0,0 +1,21 @@
+# Comparing frames from different data sets
+
+This workflow explains how to compare two frames from different data sets. In this example, it shows how to compare the median frames from each data set. Comparing the median frames helps you understand what might be happening in a frame that is central to the distribution for each data set. 
+
+## Step 1: Collect performance data to analyze
+
+1. Open the Profile Analyzer window (menu: **Window &gt; Analysis &gt; Profile Analyzer**). Click the **Compare** button in the toolbar to enter the Compare view.
+1. Collect some profiling data. To pull data from an active profiling session, click the **Pull Data** button. This pulls in the current set of available frames from the Profiler. If you don't have an active profile session, click the **Open Profiler Window** button, then load or record some data. For more information on how to collect data, see the workflow documentation on [Collecting and viewing data](collecting-and-viewing-data.md).
+1. Pull a different data set that you want to analyze into each graph in the [Frame Control](frame-range-selection.md) pane.
+
+## Step 2: Select frames of interest
+
+Enable **Pair Graph Selection**. Right-click on one of the graphs in the Frame Control pane and then choose **Select Median Frame** from the context menu.
+
+The Profile Analyzer then analyzes the two median frames of the data sets like this:
+
+![Two data sets compared](images/profile-analyzer-compare-different-data-sets.png)
+
+You can then look further and compare the differences between the median frames of each data set.
+
+For further information, see the [Ordering frames by length](ordering-frames-by-cost.md) workflow, which extends the selected range and number of frames used from the middle of the frame distribution.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/collecting-and-viewing-data.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/collecting-and-viewing-data.md
new file mode 100644
index 0000000..a03b56b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/collecting-and-viewing-data.md
@@ -0,0 +1,37 @@
+# Collecting and viewing data
+
+This workflow explains how to populate the [Unity Profiler](https://docs.unity3d.com/Manual/Profiler.html) and Profile Analyzer with data. Note that the Profile Analyzer only analyzes CPU data from the Profiler. 
+
+## Step 1: Open the Unity Profiler
+
+Go to the menu: **Window &gt; Analysis &gt; Profiler** or press Ctrl+7 (Command+7 on macOS). If you have the Profile Analyzer window open, you can click the **Open Profiler Window** button.
+
+## Step 2: Populate the Profiler with data
+
+To use the Profile Analyzer, you must populate it with data from the Profiler. To add data to the Profiler, you can either record some new data, or load a Profiler capture file in the .data file format.
+
+### a) Record new data
+
+Click the **Attach to Player** dropdown at the top of the window (next to the Record button) and select a player to profile. By default this is set to **Playmode**. Click the **Record** button to start recording data. If you enabled **Autoconnect to Profiler** in the Build Settings, the Profiler automatically collects data when you start a built player.
+
+For more information on how to record data in the Profiler, see the documentation on [Profiling your application](https://docs.unity3d.com/Manual/profiler-profiling-applications.html) in the Unity User Manual.
+
+### b) Load data
+
+To load a saved .data file, in the top right of the Profiler window, select the **Load** button.
+
+## Step 3: Pull the data into the Profile Analyzer window
+
+Open the Profile Analyzer window (menu: **Window &gt; Analysis &gt; Profile Analyzer**) and then select the **Pull Data** button in the [Frame Control](frame-range-selection.md) pane. The Profile Analyzer then pulls in the data that is loaded in the Profiler window.
+
+>[!TIP]
+>The Profiler window and the Profile Analyzer window require a lot of screen real-estate. Docking the two windows together in a single tabbed window lets you navigate between the two views quickly.
+
+![Profiler and Profile Analyzer](images/profile-analyzer-profiler-docked.png)<br/>*The Profile Analyzer in the Compare mode docked next to the Profiler in one window*
+
+## Step 4: Load and save Profile Analyzer data
+
+To save the data from the Profile Analyzer, click the **Save** button in any view. Select where you would like to save your data, and then Unity saves the data in the .pdata format. To load this data, click the **Load** button in any view.
+
+>[!NOTE]
+>When you load data into the Profile Analyzer, the data must be in the Profile Analyzer .pdata format. If you have data from the Profiler in the .data file format, open it in the Profiler first, and in the Profile Analyzer select the **Pull Data** button.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/compare-view.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/compare-view.md
new file mode 100644
index 0000000..ab08dcb
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/compare-view.md
@@ -0,0 +1,119 @@
+# Compare view
+
+In the **Compare** view you can load two data sets, which the Profiler Analyzer displays in two different colors. It displays the information from both data sets in a similar way to the [Single view](single-view.md) and has the same panes and panels.
+
+For information on navigating the window, see the [Profile Analyzer window navigation](profile-analyzer-window.html/#window-navigation) documentation.
+
+![Compare View](images/profile-analyzer-compare-view.png)<br/>*The Compare view with two data sets loaded.*
+
+## Loading data
+
+To load data into the **Compare** view, select the **Pull Data** button in the frame control pane, and the Profile Analyzer pulls in any data in the [Profiler](https://docs.unity3d.com/Manual/Profiler.html) window. Alternatively, select the **Load** button to load Profile Analyzer (.pdata) data you have saved from a previous session.
+
+>[!NOTE]
+>If you select the **Load** option, the data must be in the Profile Analyzer .pdata format. If you have data from the Profiler in the .data file format, open it in the Profiler first, and then select the **Pull Data** button in the Profile Analyzer.
+
+For more information on how to pull data into the Profile Analyzer, see the workflow documentation on [Collecting and viewing data](collecting-and-viewing-data.md).
+
+## Marker Comparison list
+
+The **Marker Comparison** pane contains a sortable list of markers with a number of useful statistics, including the difference between the two sets. The proportional graphs with the `<` and `>` labels visualize the values of each marker, so you can see the difference between the timings of both samples.  
+
+If you select a marker in the list, the **Marker Summary** panel displays in depth information on the marker. Each marker in the list is an aggregation of all the instances of that marker, across all filtered threads and in all ranged frames.
+
+You can filter the columns in the **Marker Comparison** list to a more relevant set. This is particularly useful if you want to filter out irrelevant data when you look for **Time** or **Count** values. To filter the columns, select the **Marker columns** dropdown from the **Filters** pane. For more information on how to filter data, see the [Filters](filtering-system.md) documentation.
+
+### Marker Comparison columns and groups
+
+By default, the **Marker columns** dropdown in the **Filters** pane has six preset column layouts that you can use to adjust the layout of the **Marker Comparison** pane. They are:
+
+* **Time and count:** Displays information on the average timings and number of times the markers were called.
+* **Time:** Displays information on the average timings of the markers.
+* **Totals:** Displays information about the total amount of time the markers took on the whole data set.
+* **Time with totals:** Displays information about both the average and total times of the markers.
+* **Count totals:** Displays information about the total number of times the markers were called.
+* **Count per frame:** Displays information on the average total per frame the markers were called.
+* **Depths:** Displays information on where the markers are in the Hierarchy. For more information, see the documentation on Depth Slices in [Filters pane](filtering-system.html#depth-slice).
+* **Threads:** Displays the name of the thread that the markers appear on. For more information, see the documentation on the Thread window in [Filters pane](filtering-system.html#thread-window).
+
+You can also use the **Custom** column layout to select your own custom mix of columns to add to the layout. To do this, right click on the header of any column, and manually enable or disable any of the columns as necessary.
+
+>[!NOTE]
+>In this pane, the **Left** label refers to the first data set loaded into the **Frame Control** pane, which is colored blue. The **Right** label refers to the second data set, which is colored orange.
+
+The following table shows the columns that the Profile Analyzer displays when you select that layout.
+
+||**Time and count**| **Time**| **Totals**| **Time with totals**| **Count totals**| **Count per frame** |**Depths**|**Threads**|
+|---|---|---|---|---|---|---|---|---|
+|**Marker Name**|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|
+|**Left Median**<br/> **Right Median**|&#10003;|&#10003;||&#10003;|||||
+|`<`<br/> `>`|&#10003;|&#10003;||&#10003;|||||
+|**Diff**|&#10003;|&#10003;|||||||
+|**Diff Percent**|||||||||
+|**Abs Diff**|&#10003;|&#10003;||&#10003;|||||
+|**Count Left** <br/> **Count Right**|&#10003;||||&#10003;||||
+|`<` **Count** <br/> `>` **Count**|||||&#10003;||||
+|**Count Delta**|&#10003;||||&#10003;||||
+|**Count Delta Percent**|||||||||
+|**Abs Count**|||||&#10003;||||
+|**Count Left Frame** <br/> **Count Right Frame**||||||&#10003;|||
+|`<` **Frame Count** <br/> `>` **Frame Count**||||||&#10003;|||
+|**Count Delta Frame**||||||&#10003;|||
+|**Count Delta Percent Frame**|||||||||
+|**Abs Frame Count**||||||&#10003;|||
+|**Total Left** <br/> **Total Right**|||&#10003;|&#10003;|||||
+|`<` **Total** <br/> `>` **Total**|||&#10003;|&#10003;|||||
+|**Total Delta**|||&#10003;||||||
+|**Total Delta Percent**|||||||||
+|**Abs Total**|||&#10003;|&#10003;|||||
+|**Depth Left** <br/> **Depth Right**|||||||&#10003;||
+|**Depth Diff**|||||||&#10003;||
+|**Threads Left** <br/> **Threads Right**||||||||&#10003;|
+
+The following table explains what each column does:
+
+|**Column**|**Description**|
+|---|---|
+|**Marker Name**| Displays the name of the marker.|
+|**Left Median** <br/> **Right Median** | The sum of activity for the marker. **Left Median** displays the first data set loaded into the **Frame Control** pane, colored blue. **Right Median** displays the second data set loaded into the **Frame Control** pane, colored orange.|
+|`<` <br/> `>`|A visual representation of the **Left Median** (`<`) and **Right Median** (`>`) data.|
+|**Diff**|The difference between the summed values in each data set. Negative values mean that the left (blue) set of data is bigger, positive means the right (orange) set of data is bigger.|
+|**Diff Percent**|The difference relative to the first data set.|
+|**Abs Diff**|The absolute difference between the summed values in each data set.|
+|**Count Left**<br/>**Count Right**|The number of times the marker started or stopped. **Count Left** displays the first data set loaded into the **Frame Control** pane, colored blue. **Count Right** displays the second data set loaded into the **Frame Control** pane, colored orange.|
+|`<` **Count** <br/> `>` **Count**|A visual representation of the **Count Left** and **Count Right** data.|
+|**Count Delta**|The difference between the **Count** values in each data set. Negative values mean that the left (blue) set of data is bigger, positive means the right (orange) set of data is bigger.|
+|**Count Delta Percent**|The difference in count relative to the first data set.|
+|**Abs Count**|The absolute difference between the **Count** values for the selected frames. Negative values mean that the left (blue) set of data is bigger, positive means the right (orange) set of data is bigger.|
+|**Count Left Frame** <br/> **Count Right Frame**| The average count of the marker over all non-zero frames. **Count Left Frame** displays the first data set loaded into the **Frame Control** pane, colored blue. **Count Right Frame** displays the second data set loaded into the **Frame Control** pane, colored orange.|
+|`<` **Frame Count** <br/> `>` **Frame Count**|A visual representation of the **Count Left Frame** and **Count Right Frame** data.|
+|**Count Delta Frame**|The difference between the **Count Left Frame** and **Count Right Frame** values. Negative values mean that the left (blue) set of data is bigger, positive means the right (orange) set of data is bigger.|
+|**Count Delta Percent Frame**|The difference in average count relative to the first data set.|
+|**Abs Frame Count**|The absolute difference between the number of times the marker started or stopped in each data set.|
+|**Total Left** <br/> **Total Right**|The total time for the marker over the selected frames. **Total Left** displays the first data set loaded into the **Frame Control** pane, colored blue. **Total Right** displays the second data set loaded into the **Frame Control** pane, colored orange.|
+|`<` **Total** <br/> `>` **Total**|A visual representation of the **Total Left** and **Total Right** data.|
+|**Total Delta**|The difference between the total times over the selected frames in each data set. Negative values mean that the left (blue) set of data is bigger, positive means the right (orange) set of data is bigger.|
+|**Total Delta Percent**|The difference in total time relative to the first data set.|
+|**Abs Total**|The absolute difference between the total times over all of the selected frames in each data set.|
+|**Depth Left** <br/> **Depth Right**|The level, or depth, that the marker appears at. The marker might appear on multiple depth levels. **Depth Left** displays the first data set loaded into the **Frame Control** pane, colored blue. **Depth Right** displays the second data set loaded into the **Frame Control** pane, colored orange.|
+|**Depth Diff**|The difference between the **Depth Left** and **Depth Right** values.|
+|**Threads Left** <br/> **Threads Right**|The name of the thread that the marker appears on. **Threads Left** displays the first data set loaded into the **Frame Control** pane, colored blue. **Threads Right** displays the second data set loaded into the **Frame Control** pane, colored orange.|
+
+### Marker Comparison context menu commands
+
+If you right-click on a marker in the **Marker Comparison** list you can control the filter and list even further.
+
+|**Command**|**Function**|
+|---|---|
+|**Select Frames that contain this marker (within whole data set)**| Select all the frames from the entire data set that contain an instance of this marker.|
+|**Select Frames that contain this marker (within current selection)**| Select all the frames from a selected range of data that contain an instance of this marker.|
+|**Select All**| Selects the entire data set, if you have a range of data selected.|
+|**Add to / Remove From Include Filter**| Add or remove the selected marker to the **Include** filter. This filters the marker list to only markers that match.|
+|**Add to Exclude Filter**| Add the selected marker to the **Exclude** filter. This removes the marker from the marker list. This is useful if you want to remove markers that are using up resources and skewing the markers that you are interested in.|
+|**Set as Parent Marker Filter**| Limit the analysis to this marker and markers included below it on the callstack. For more information, see the [Parent Marker](filtering-system.html#parent-marker) documentation on the Filters page.|
+|**Clear Parent Marker Filter**| Select this to clear the marker as a parent marker filter.|
+|**Copy To Clipboard**| Copies the selected value to the clipboard.|
+
+## Analyzing data in Compare view
+
+For further information on how to analyze data in Compare view, see the workflow documentation on [Comparing frames from different data sets](comparing-frames-same-dataset.md) and [Comparing frames from the same data set](comparing-frames-same-dataset.md).
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/comparing-frames-same-dataset.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/comparing-frames-same-dataset.md
new file mode 100644
index 0000000..dd7df5a
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/comparing-frames-same-dataset.md
@@ -0,0 +1,22 @@
+# Comparing frames from the same data set
+
+This workflow explains how to compare two frames from the same data set. In this example, it explains how to compare the median and longest frames in a data set. Comparing the median and longest frames is useful to help understand what is happening in the longest frame that is not happening in an average frame, or what is taking longer than average to complete.
+
+## Step 1: Collect performance data to analyze
+
+Open the Profile Analyzer window (menu: **Window &gt; Analysis &gt; Profile Analyzer**) and collect some profiling data. To pull data from an active profiling session, click the **Pull Data** button. This pulls in the current set of available frames from the Profiler. If you don't have an active profile session, click the **Open Profiler Window** button, then load or record some data.
+
+For more information on how to collect data, see the workflow documentation on [Collecting and viewing data](collecting-and-viewing-data.md).
+
+## Step 2: Open Compare view
+
+Click the **Compare** button in the toolbar to switch to the [Compare View](compare-view.md).
+
+## Step 3: Select the median and longest frames
+
+1. In the [Frame Control](frame-range-selection.md) pane, right click on the top graph and choose **Select Median Frame** from the context menu.
+1. Next, right click on the lower graph and choose **Select Longest Frame** in the context menu.
+
+The Profile Analyzer then analyzes the two frames and displays the data for the median and longest frames:
+
+![Data comparison on same set](images/profile-analyzer-compare-same-data-set.png)<br/>*The Profile Analyzer window with the median and longest frames of the same data set selected*
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/filter.yml b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/filter.yml
new file mode 100644
index 0000000..316c9bd
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/filter.yml
@@ -0,0 +1,43 @@
+apiRules:
+    - exclude:
+        # inherited Object methods
+        uidRegex: ^System\.Object\..*$
+        type: Method
+    - exclude:
+        # mentioning types from System.* namespace
+        uidRegex: ^System\..*$
+        type: Type
+    - exclude:
+        # mentioning types from NiceIO.* namespace
+        uidRegex: ^NiceIO\..*$
+        type: Type
+    - exclude:
+        # mentioning types from Format.* namespace
+        uidRegex: ^Format\..*$
+        type: Type
+    - exclude:
+        hasAttribute:
+            uid: System.ObsoleteAttribute
+        type: Member
+    - exclude:
+        hasAttribute:
+            uid: System.ObsoleteAttribute
+        type: Type
+    - exclude:
+        uidRegex: ^$
+        type: Namespace
+    - exclude:
+        uidRegex: .*Tests$
+        type: Type
+    - exclude:
+        uidRegex: .*Test$
+        type: Type
+    - exclude:
+        uidRegex: .*Fixture$
+        type: Type
+    - exclude:
+        uidRegex: UnityEditor.Performance.ProfileAnalyzer.DepthSliceUI
+        type: Type
+    - exclude:
+        uidRegex: GetUIThreadName
+        type: Method
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/filtering-system.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/filtering-system.md
new file mode 100644
index 0000000..42a463c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/filtering-system.md
@@ -0,0 +1,48 @@
+# Filters pane
+
+You can use the **Filters** pane in the [Single](single-view.md) and [Compare](compare-view.md) view to reduce and filter the working data set. You can limit the data set by filters such as partial marker name match, a specific thread, or a specific stack level. As well as filtering by match, you can set the filter to exclude any markers by name. This is particularly useful to exclude markers the might distort the view, or aren't statistically relevant.
+
+![Filter pane](images/profile-analyzer-filters-pane.png)<br/>*Single view Filters pane (above) and Compare view Filters pane (below). Note the addition of further Depth Slice controls in the Compare view.* 
+
+The pane has the following controls:
+
+|**Control**|**Function**|
+|---|---|
+|**Name Filter**|Enter the name of a marker you would like to filter the data set by. Once you start typing, the Profile Analyzer automatically filters the **Marker details** pane to display the matching markers. You can also right click on a marker in the **Marker details** pane and select **Add to Include Filter** to add it to the filter. To include a marker name with a space, surround it in quotation marks  <br/><br/> Choose **Any** from the dropdown to match any of the terms to the markers in the list. Select **All** from the dropdown to match all of the listed terms to the markers in the list.|
+|**Exclude Names**|Enter the name of a marker you would like to exclude from the data set. Once you start typing, the Profile Analyzer automatically filters the **Marker details** pane to display the matching markers. You can also right click on a marker in the **Marker details** pane and select **Add to Exclude Filter** to exclude it from the filter. <br/><br/> Select **Any** from the dropdown to match any of the terms to the markers in the list. Select **All** from the dropdown to match all of the listed terms to the markers in the list.|
+|**Thread**|Select which thread or threads to filter the data set by. Click the **Select** button to open the **Thread** window and filter the data set further. For more information, see the [Thread window](#thread-window) section of this page.|
+|**Depth Slice**|Set the depth level of the [Hierarchy](https://docs.unity3d.com/Manual/ProfilerCPU.html#hierarchy) to display. The **Marker Details/Comparison** view then displays all the markers on this level only. In the **Compare** view, the **Auto Right** checkbox is enabled by default, which automatically aligns the depth of the two data sets. For more information, see the [Depth Slice](#depth-slice) section of this page. |
+|**Parent Marker**|Displays the parent marker the data set is filtered by. To filter by a parent marker, right click on it in the **Marker Details/Comparison** list and then select **Set As Parent Marker Filter**. For more information, see the [Parent Marker](#parent-marker) section of this page.|
+|**Analyze** (Single view)<br/>**Compare** (Compare view)|Contains details of the number of markers and threads in the data set. **Note:** The button is redundant, because the Profile Analyzer automatically updates the marker pane with the filters you set. However, you can hover on the button to see timings of the analysis or comparison.|
+|**Analysis type**|Select what times the Profile Analyzer includes in its analysis, from either **Total** or **self**. The **Total** option sets the marker times to inclusive, which means the time spent in the marker and its children is included in the filter. The **Self** option sets the marker times to exclusive, which means that the the time in the marker's children is excluded from the filter. |
+|**Units**|Select the unit of measurement of time to display in the Profile Analyzer. Choose between **Milliseconds** (default) or **Microseconds**. <br/><br/>**Note:** If you select **Microseconds**, the Profile Analyzer displays larger timings in milliseconds.|
+|**Marker Columns**|Select a layout for the **Marker Details/Comparison** pane. For more information on the columns in this pane, see the documentation on [Single view Marker Details list](single-view.html#marker-details-list) and [Compare view Marker Comparison list](compare-view.html#marker-comparison-list).|
+
+## Thread window
+
+By default, the Profile Analyzer displays the markers on the main thread in the **Marker Details/Comparison** pane. To analyze the markers on other threads, under **Threads**, click the **Select** button, and the Threads window opens.
+
+![Thread window](images/profile-analyzer-filter-threads-window.png)<br/>*The Thread window*
+
+To add more threads to the analysis, enable the checkboxes next to their names, then click the **Apply** button. The Profile Analyzer then updates the data set. There are two pre-defined sets of threads: **Main Only** and **Common Set**. **Main Only** selects just the Main Thread, and the **Common Set** selects the Main Thread, plus the Render and Jobs threads.
+
+Click the **Clear** button to clear all of the threads you've selected, and **Reset** to reset the selection back to the previous thread set. 
+
+## Depth Slice
+
+When you select a **Depth Slice** level in the dropdown, it corresponds to the level of the marker within the hierarchy of the thread. You can visualize this in the Profiler window as follows:
+
+![Depth Slice](images/profile-analyzer-depth-slice-highlight.png)<br/>*The Profile Analyzer in the Single view with a Depth Slice of 3 selected in the Filters pane.*
+
+![Depth Slice](images/filters-depth-slice-comparison-profiler-window.png)<br/>*The Profiler window with the CPU Usage module selected, in Timeline view. Note that the markers in the Marker Details list correspond to the markers in the third level of the Main Thread's hierarchy.*
+
+In the Compare view, the Profile Analyzer automatically aligns the depth of the two data sets so that the top level markers are aligned correctly. The value of the offset is displayed in brackets after the **Auto Right** checkbox.
+
+To override the automatic depth alignment, disable the **Auto Right** checkbox and then manually set the depth levels for the left (blue) and right (orange) sets. This is useful if you're comparing data sets from different versions of Unity. 
+
+## Parent Marker
+
+To filter the dataset by a specific marker and its children, right click on the marker in the **Marker Details/Comparison** pane and then select **Set As Parent Marker Filter**. You can visualize this in the Profiler window as follows: 
+
+![Parent marker](images/filters-parent-marker-comparison-profile-analyzer.png)<br/>*The Profile Analyzer in the Single view with the data filtered by the parent marker of BehaviourUpdate.*
+![Parent marker](images/filters-parent-marker-comparison-profiler.png)<br/>*The same frame opened in the Profiler window, with this thread highlighted. Note that the markers in the Timeline view correspond to those filtered in the Profile Analyzer.*
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/frame-range-selection.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/frame-range-selection.md
new file mode 100644
index 0000000..fee3e53
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/frame-range-selection.md
@@ -0,0 +1,71 @@
+# Frame Control pane
+
+You can use the **Frame Control** pane in both the [Single](single-view.md) and [Compare](compare-view.md) views  to select a range of frames to reduce the working set. The Frame Control pane is laid out as follows:
+
+![Frame Control pane](images/profile-analyzer-frame-control-pane.png)<br/>*The Frame Control in the Single view (top), and in the Compare view (bottom)*
+
+|**Control**|**Function**|
+|---|---|
+|**A:** Pull Data / Load / Save| Click the **Pull Data** button to pull any data that is loaded in the [Profiler](https://docs.unity3d.com/Manual/Profiler.html) window.<br/>Click the **Save** button to save the data as a .pdata file.<br/>Click the **Load** button to load a .pdata file. **Note:** You can only load a .pdata file. If you have data from the Profiler in the .data file format, open it in the Profiler first, and then select the **Pull Data** button in the Profile Analyzer.|
+|**B:** Frame control scale| You can adjust the scale of the y-axis of the Frame Control graph by selecting this dropdown. By default, it scales to the maximum value of the data set. You can also choose from traditional frame boundaries. 16.67ms is equivalent to 60Hz/FPS, 33.33ms is equivalent to 30Hz/FPS, and  66.67ms is equivalent to 15Hz/FPS.|
+|**C:** Selected thread| This displays the name of the marker which is selected in the **Marker Details** pane. When you select a thread from this list, the Profile Analyzer highlights its corresponding timings on the Frame Control graph in a green-blue color.|
+|**D:** Pair Graph Selection<br/>*(Compare view only)*| When you enable this checkbox, the Profile Analyzer reflects any changes you make in the range selection of a data set in both data sets. This is important to ensure you compare the exact same number of frames in both data sets and get an accurate comparison. |
+
+## Selecting a frame range
+
+The Profile Analyzer uses all the frames in the data sets unless you select a sub-range. When you select a sub-range, it limits the analysis to just those frames which lets you focus on a specific frame or set of frames. To select a range of frames, click and drag on the Frame Control graph. To clear the selection, right click on the Frame Control graph and select **Clear Selection**.
+
+To help visualize which frames are in the current selection, the start and end frame number, plus the frame count in square brackets appears on the x-axis of the graph.
+
+![Frame Control pane with selected item](images/profile-analyzer-frame-control-selection.png)<br/>*The Frame Control in the Single view (top), with 187 frames selected, starting on frame 37 and ending on frame 224. The  Compare view (bottom) has Pair Graph Selection enabled, with the same 237 frames selected on both graphs, starting on frame 135 and ending on frame 371.*
+
+## Frame range controls
+
+You can control the selection of data in both the **Single** and **Compare** views by using the following shortcuts, or by right-clicking and selecting an option from the context menu.
+
+>[!NOTE]
+>In **Compare** view, make sure you enable the **Pair Graph Selection** checkbox to carry out the following commands on both graphs at the same time.
+
+### Shortcuts
+
+|**Shortcut**|**Function**|
+|---|---|
+|**Shift+click**|Hold down the Shift key while clicking on the selection on the Frame Control graph to move the selection around freely.|
+|**Left/Right arrow**|Move the selection forward or backwards by one frame.|
+|**Ctrl + click**<br/>(**Command + click** on macOS)| Selects multiple parts of the data set. Hold down the Ctrl key (Command key on macOS) while making a selection and then click, and optionally drag, on different sections of the chart to select multiple parts of the data set.|
+|**Equals (=)**| Extend the selection by one frame on each end of the selection.|
+|**Alt+Equals**<br/>(**&#8997; + Equals** on macOS)|Reduce the selection by one frame on each end of the selection.|
+|**Shift+Equals**| Extend the selection by 10 frames on each end of the selection.|
+|**Hyphen (-)**|Reduce the selection by one frame on each end of the selection.|
+|**Alt+Hyphen**<br/>(**&#8997; + Hyphen** on macOS)|Extend the selection by one frame on each end of the selection.|
+|**Shift+Hyphen**| Reduce the selection by 10 frames on each end of the selection.|
+|**Comma (,)**| Extend the start of the selection by one frame.|
+|**Alt+Comma**<br/>(**&#8997; + Comma**) on macOS|Reduce the start of the selection by one frame.|
+|**Shift+Comma**|Extend the start of the selection by 10 frames.|
+|**Period (.)**| Extend the end of the selection by one frame.|
+|**Alt+Period**<br/>**(&#8997; + Period on macOS)**|Reduce the end of the selection by one frame.|
+|**Shift+Period**|Extend the end of the selection by 10 frames.|
+|**1**<br/>**2**<br/>*Compare view only*|In **Compare** view, with **Pair Graph Selection** disabled, use the 1 or 2 key on your keyboard to switch between frames. 1 selects the top data, and 2 selects the bottom data. |
+
+### Context menu commands
+
+Right click on the Frame Control graph to bring up the context menu.
+
+|**Menu item**|**Function**|
+|---|---|
+|**Clear Selection**|Clears the selected range. The Profile Analyzer then performs the analysis on the whole data set.|
+|**Invert Selection**|Inverts the selected range.|
+|**Select Shortest Frame**|Selects the frame with the shortest time.|
+|**Select Longest Frame**|Selects the frame with the longest time.|
+|**Select Median Frame**| Selects the frame with the Median time. |
+|**Move selection left / right**|Move the whole selection one frame backwards, or one frame forwards. |
+|**Grow selection**|Extend the selection by one frame on each end of the selection. Select the **(fast)** operation to extend the selection by 10 frames at each end.|
+|**Shrink selection**|Reduce the selection by one frame on each end of the selection. Select the **(fast)** operation to reduce the selection by 10 frames at each end.|
+|**Grow selection left / right**|Extend the start or the end of the selection by one frame. Select the **(fast)** operation to extend the start or the end of the selection by 10 frames.|
+|**Shrink selection left /right**|Reduce the selection by one frame at the beginning or the end of the selection. Select the **(fast)** operation to reduce the start or the end of the selection by 10 frames.|
+|**Zoom Selection**| Zoom the Frame Control graph to display the selected range only.|
+|**Zoom All**| Zoom out to show all frames. The current selection range is highlighted.|
+|**Show Selected Marker**| Enable this setting to highlight the selected marker's time on the Frame Control graph. By default, this setting is enabled and the Profile Analyzer highlights the marker's timings in green on the graph.|
+|**Show Filtered Threads**|Enable this setting to highlight the current filtered thread times on the Frame Control graph. The Profile Analyzer highlights the timings in purple. This setting is disabled by default.|
+|**Show Frame Lines**| Enable this setting to display the common frame boundaries as a horizontal line on the Frame Control graph. This setting is enabled by default.|
+|**Order By Frame Duration**| Enable this setting to display the order of the frames by their duration from smallest to largest on the Frame Control graph, rather than by frame index. By default, this setting is disabled. This setting is particularly useful to group similar performant frames together.|
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/frame-summary.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/frame-summary.md
new file mode 100644
index 0000000..d4866c1
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/frame-summary.md
@@ -0,0 +1,23 @@
+# Frame Summary
+
+The Frame Summary pane displays a summary of the frame times for the range of data selected. This pane provides useful information about the frames in the data selection, including the maximum, minimum, upper and lower quartile, mean, and median timings.
+
+![Frame Summary](images/frame-summary-pane.png)<br/>*The Frame Summary pane in Single view (left,) and Compare view (right)*
+
+The Frame Summary pane is a good way for you to see at an overview what frames might be an outlier and how evenly distributed the timings are in the data set. For example, in the above screenshot, in the Compare view, while the median values are fairly similar, with little difference, the maximum frame value differs greatly, which suggests that the Right data set had more spikes in performance, that you could focus investigating further.
+
+## Statistics
+
+|**Statistic**|**Description**|
+|---|---|
+|**Frame Count**|The number of frames selected in the [Frame Control pane](frame-range-selection.md).<br/><br/>In Compare view, the **Left** count corresponds to the first data set loaded into the Profile Analyzer, colored blue, and the **Right** count corresponds to the second data set loaded into the Profile Analyzer, colored orange. <br/><br/>The **Diff** count is the difference in frame count between the Right and Left values. When this number is negative, it indicates that the Left frame count is larger than the Right frame count. When the Diff is a positive number, it means that the Right frame count is larger than the Left frame count.|
+|**Start**|The frame number that the data selection starts on. In Single view, you can click the button next to this number to jump to the relevant frame in the Profiler window.|
+|**End**|The frame number that the data selection ends on. In Single view, you can click the button next to this number to jump to the relevant frame in the Profiler window.|
+|**Max**|The largest (maximum) frame time in the data selection. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Upper Quartile**|Displays the upper [quartile](https://en.wikipedia.org/wiki/Quartile) of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Median**|Displays the [median](https://en.wikipedia.org/wiki/Median) value of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Mean**|Displays the [mean](https://en.wikipedia.org/wiki/Arithmetic_mean) value of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Lower Quartile**|Displays the lower [quartile](https://en.wikipedia.org/wiki/Quartile) of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Min**|The smallest (minimum) frame time in the data selection. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+
+Underneath the statistics, the Profile Analyzer displays the timings as a histogram and box and whisker plot. For further information on the statistics available and how to analyze them, see the documentation on [Statistics in the Profile Analyzer](statistics.md).
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/different-distributions.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/different-distributions.png
new file mode 100644
index 0000000..c0053c9
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/different-distributions.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/even-distribution.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/even-distribution.png
new file mode 100644
index 0000000..690d3e5
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/even-distribution.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-depth-slice-comparison-profiler-window.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-depth-slice-comparison-profiler-window.png
new file mode 100644
index 0000000..aabc989
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-depth-slice-comparison-profiler-window.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-parent-marker-comparison-profile-analyzer.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-parent-marker-comparison-profile-analyzer.png
new file mode 100644
index 0000000..b68b23d
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-parent-marker-comparison-profile-analyzer.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-parent-marker-comparison-profiler.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-parent-marker-comparison-profiler.png
new file mode 100644
index 0000000..6610ca7
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/filters-parent-marker-comparison-profiler.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/frame-summary-pane.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/frame-summary-pane.png
new file mode 100644
index 0000000..a948fb8
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/frame-summary-pane.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/jump-to-frame-button.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/jump-to-frame-button.png
new file mode 100644
index 0000000..7272b71
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/jump-to-frame-button.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/marker-summary-pane.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/marker-summary-pane.png
new file mode 100644
index 0000000..0220538
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/marker-summary-pane.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/outlier.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/outlier.png
new file mode 100644
index 0000000..c570184
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/outlier.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/overlapping-distributions.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/overlapping-distributions.png
new file mode 100644
index 0000000..e3d681b
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/overlapping-distributions.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-different-data-sets.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-different-data-sets.png
new file mode 100644
index 0000000..c7fea91
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-different-data-sets.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-same-data-set.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-same-data-set.png
new file mode 100644
index 0000000..07220d7
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-same-data-set.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-view.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-view.png
new file mode 100644
index 0000000..2978d7b
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-compare-view.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-depth-slice-highlight.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-depth-slice-highlight.png
new file mode 100644
index 0000000..a5e50d9
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-depth-slice-highlight.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-filter-threads-window.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-filter-threads-window.png
new file mode 100644
index 0000000..59fe4fe
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-filter-threads-window.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-filters-pane.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-filters-pane.png
new file mode 100644
index 0000000..64c578e
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-filters-pane.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-control-pane.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-control-pane.png
new file mode 100644
index 0000000..ca0b9f2
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-control-pane.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-control-selection.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-control-selection.png
new file mode 100644
index 0000000..b065eca
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-control-selection.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-duration.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-duration.png
new file mode 100644
index 0000000..3989974
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-frame-duration.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-profiler-docked.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-profiler-docked.png
new file mode 100644
index 0000000..31c0fd8
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-profiler-docked.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-single-view-annotated.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-single-view-annotated.png
new file mode 100644
index 0000000..2df9c35
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-single-view-annotated.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-single-view.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-single-view.png
new file mode 100644
index 0000000..e9e52dc
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-single-view.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-window.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-window.png
new file mode 100644
index 0000000..84cc944
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/profile-analyzer-window.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/similar-distributions.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/similar-distributions.png
new file mode 100644
index 0000000..5cc443f
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/similar-distributions.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/thread-summary.png b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/thread-summary.png
new file mode 100644
index 0000000..b6090bf
Binary files /dev/null and b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/images/thread-summary.png differ
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/index.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/index.md
new file mode 100644
index 0000000..8e7df14
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/index.md
@@ -0,0 +1,29 @@
+# About the Profile Analyzer package
+
+The Profile Analyzer aggregates and visualizes frame and marker data from a set of [Unity Profiler](https://docs.unity3d.com/Manual/Profiler.html) frames to help you understand their behavior. You can use the Profile Analyzer to compare two sets of data side-by-side, which complements the single frame analysis already available in the Unity Profiler.
+
+For information on how to use the Profile Analyzer, see the documentation on the [Profile Analyzer window](profile-analyzer-window.md)
+
+![The Profile Analyzer window](images/profile-analyzer-compare-view.png)<br/>*The Profile Analyzer window, with two sets of data loaded*
+
+## Installing the Profile Analyzer
+
+To install this package into versions of Unity that support the package manager follow the instructions in the [Package Manager documentation](https://docs.unity3d.com/Documentation/Manual/upm-ui-quick.html).
+
+When using any Unity version newer than 2021.2.0a5, you can just click __[this link to install it by name](com.unity3d.kharma:upmpackage/com.unity.performance.profile-analyzer)__.
+
+
+## Requirements
+
+This version of the Profile Analyzer is compatible with the following versions of the Unity Editor:
+
+* 2020.3 and later
+
+For earlier versions, follow this link to the Profile Analyzer [download](https://download.packages.unity.com/com.unity.performance.profile-analyzer/-/com.unity.performance.profile-analyzer-1.1.1.tgz) and place the contents into your Project's Assets folder.
+
+## Known limitations
+
+The Profile Analyzer has the following known limitations:
+
+* The original Profile data is not saved in the Profile Analyzer .pdata file. Therefore, you should store both the Unity Profiler .data file (or the .raw file exported from a stand alone player) along with the .pdata file.
+* When you click on a marker, the Profile Analyzer attempts to jump to the same marker in the Unity Profiler if the same data is loaded. You must make a selection in the Unity Profiler beforehand for this to work. In the Unity Profiler in the UI view, the vertical height is not correct.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/marker-summary.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/marker-summary.md
new file mode 100644
index 0000000..b8e7e45
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/marker-summary.md
@@ -0,0 +1,22 @@
+# Marker Summary
+
+The Marker Summary pane summarizes the marker data of the current selected item in the **Marker Details** list. You can use this pane to get an overview of the markers that contribute the most amount of time to the data set. For more information on the statistics in this pane, see the [Statistics](statistics.md) documentation.
+
+![Marker summary](images/marker-summary-pane.png)<br/>*The Marker Summary pane, in Single View (left), and Compare View (right)*
+
+## Statistics
+
+|**Statistic**|**Description**|
+|---|---|
+|**Marker name**|Displays the name of the selected marker.|
+|**Mean frame contribution**|Visualization of the marker's mean frame contribution as a percentage of the data set's total time.|
+|**First frame**|Link to the frame that the marker first appeared in. Click the button to jump to the relevant frame in the Profiler window.|
+|**Top by frame costs**|Displays the longest occurrences of the marker in the data set. Use the dropdown to display up to 10 entries in the list.|
+|**Max**|The largest (maximum) frame time in the data selection. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Upper Quartile**|Displays the upper [quartile](https://en.wikipedia.org/wiki/Quartile) of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Median**|Displays the [median](https://en.wikipedia.org/wiki/Median) value of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Mean**|Displays the [mean](https://en.wikipedia.org/wiki/Arithmetic_mean) value of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Lower Quartile**|Displays the lower [quartile](https://en.wikipedia.org/wiki/Quartile) of the data set. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Min**|The smallest (minimum) frame time in the data selection. In Compare view, the Diff column shows the difference between the Right and Left timings.|
+|**Individual Max**|The maximum value of an individual marker instance.|
+|**Individual Min**|The minimum value of an individual marker instance.|
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/ordering-frames-by-cost.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/ordering-frames-by-cost.md
new file mode 100644
index 0000000..33b6f4e
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/ordering-frames-by-cost.md
@@ -0,0 +1,25 @@
+# Ordering frames by length
+
+This workflow explains how to order the frame data in the Profile Analyzer by frame length, shortest to longest, which results in an s-curve style graph. The Profile Analyzer groups frames with similar performance together, which enables you to create sub-ranges over a set of similar performing frames without including any outliers. This is particularly useful to normalize the data and to focus on only the shortest, longest, or average frames in the data set.
+
+This workflow applies for both [Single view](single-view.md) and [Compare view](compare-view.md).
+
+## Step 1: Collect performance data to analyze
+
+Open the Profile Analyzer window (menu: **Window &gt; Analysis &gt; Profile Analyzer**) and collect some profiling data. To pull data from an active profiling session, click the **Pull Data** button. This pulls in the current set of available frames from the Profiler. If you don't have an active profile session, click the **Open Profiler Window** button, then load or record some data.
+
+For more information on how to collect data, see the workflow documentation on [Collecting and viewing data](collecting-and-viewing-data.md).
+
+## Step 2: Order the data set
+
+If you are in the Compare view, enable the **Pair Graph Selection** checkbox. By default, the data set is ordered by frame number. To order the frames by their length, right click on a graph in the Frame Control pane, and select **Order by Frame Duration**.
+
+The Profile Analyzer then orders the graph from shortest to longest frame.
+
+## Step 3: Select frames of interest
+
+Click and drag on the graph to select a range of frames with similar performance from the middle of the distribution.
+
+![Frames ordered by duration](images/profile-analyzer-frame-duration.png)<br/>*Top, the Frame Control pane in Single view, with the graph ordered by frame duration, and a range of frames selected. Bottom, the Frame Control pane in Compare view, with the graph ordered by frame duration, and a range of frames selected.*
+
+You can now use the Profile Analyzer to analyze data from frames that have a similar performance.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/profile-analyzer-window.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/profile-analyzer-window.md
new file mode 100644
index 0000000..1f59297
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/profile-analyzer-window.md
@@ -0,0 +1,76 @@
+# Profile Analyzer window
+
+The Profile Analyzer window visualizes frame, thread, and marker data from the [Unity Profiler](https://docs.unity3d.com/Manual/Profiler.html) window. You can use it to analyze the performance of specific markers, threads, and frames.
+
+To open the Profile Analyzer window, in the Unity Editor go to menu: **Window &gt; Analysis &gt; Profile Analyzer**.
+
+![Profile Analyzer Window](images/profile-analyzer-window.png)<br/>*The Profile Analyzer window on start up, with no data loaded.*
+
+The Profile Analyzer has two views:
+
+* **Single:** The [Single view](single-view.md) displays one set of Profiler data. You can use this view to analyze specific events on one set of profiling data.
+* **Compare:** In the [Compare view](compare-view.md), you can load two sets of Profiler data to compare. You can use the Compare view to compare two different sets of profiling data, or to compare different events in the same data set.
+
+In both views, the Profile Analyzer displays min, max, median, mean, and lower/upper quartile values of the selected frame range. It also displays information on the distribution of each profiler marker in histograms and box and whisker plots.
+
+## Pulling and analyzing performance data
+
+The Profile Analyzer only analyzes CPU data. It can either analyze data from the active set of frames loaded into the Profiler, or from a saved Profile Analyzer .pdata file.
+
+The Profile Analyzer aggregates the activity of each marker, and generates useful statistics to help you analyze the marker costs over a number of threads and frames. This includes summing the runtime and counts of each occurrence of every marker for all active threads and frames the Profile captured.
+
+### Pulling data from the Profiler window
+
+To pull data from an active profiling session, click the **Pull Data** button. This pulls in the current set of available frames from the Profiler and visualizes the analyzed results.
+
+If you don't have an active profile session, click the **Open Profiler Window** button, then load or record some data.
+
+### Loading and saving a data set
+
+You can save or reload any data that the Profile Analyzer analyzes at any point in time. This means you can share your analysis with others and load the results into the **Single** or **Compare** view at any time. To save the data from the Profile Analyzer, click the **Save** button in any view. This saves the data in the .pdata format. To load this data, click the **Load** button in any view.
+
+>[!NOTE]
+>If you select the **Load** option, the data must be in the Profile Analyzer .pdata format. If you have data from the Profiler in the .data file format, open it in the Profiler first, and then select the **Pull Data** button in the Profile Analyzer.
+
+For more information on how to pull data into the Profile Analyzer, see the workflow documentation on [Collecting and viewing data](collecting-and-viewing-data.md).
+
+## Window navigation
+
+The controls and navigation for the Profile Analyzer window are very similar in both the Single and Compare view.
+
+The Profile Analyzer window has the following controls across both views, which you can access at the top of the window:
+
+|**Control**|**Function**|
+|---|---|
+|**Single**|Enter the [Single view](single-view.md) mode. This is the default view mode.|
+|**Compare**|Enter the [Compare view](compare-view.md) mode. You can compare two sets of profiling data in this mode.|
+|**Export**|Export the data into a .csv format. When you click this button, a dialog box opens and you can choose from:<br/> **Marker table:** Exports the marker data visible in [Single view](single-view.md)<br/>**Single Frame Times:** Exports the frame data visible in the Single view<br/>**Comparison Frame Times:** Exports both sets of data visible in the [Compare view](compare-view.md).<br/><br/>This button is disabled if you haven't imported any data into the Profile Analyzer window.|
+|**Open Profiler Window**|Click this button to open the [Profiler window](https://docs.unity3d.com/Manual/ProfilerWindow.html). When the Profiler window is open, this button changes to **Close Profiler Window**.|
+
+When you load some data into the Profile Analyzer window, the window populates with the profiling data, and is laid out as follows:
+
+![Profile Analyzer Window](images/profile-analyzer-single-view-annotated.png)<br/>*The Profile Analyzer window in Single view
+
+|Pane|Description|
+|---|---|
+|**A:** Frame control| Displays individual frame timings, ordered by frame index or frame duration. You can also use this pane to select a range of frames for the Profile Analyzer to analyze. For more information on this pane, see the [Frame control](frame-range-selection.md) documentation. <br/><br/> In Compare View, to select the same range on both sets of data, enable **Pair Graph Selection** underneath the charts and then click and drag a selection on either of the charts. For more information on this pane, see the [Frame control](frame-range-selection.md) documentation.|
+|**B:** Filters| Use the filter pane to limit the data that the Profile Analyzer displays. You can filter by partial match name, thread, or depth slice. You can also exclude markers to remove any markers that aren't relevant from the filtered view. For more information on how to use the filter pane, see the [Filter](filtering-system.md) documentation.|
+|**C:** Top 10 markers on median frame(s)| Visualizes the ten highest duration markers that contributed to the frame. In Compare view, this shows the ten highest markers for both sets of data. You can select any of the markers in this pane to see more information on them. The Profile Analyzer reflects changes you make to the Depth filter in this pane.<br/><br/>In Compare view, to adjust how the Profile Analyzer draws the markers against each other, use the **Ratio** dropdown.<br/> **Normalised** displays the two data sets relative to their own time at the selected depth. <br/>**Longest** displays the absolute difference between the two sets at the selected depth.|
+|**D:** Marker details for currently selected range *(Single view)*<br/>Marker Comparison for currently selected range *(Compare view)*| A sortable list of markers, with detailed information on their timings. For more information on the particular statistics available in these panes, see the documentation on [Single view marker details list](single-view.html#marker-details-list) and [Compare view Marker Comparison list](compare-view.html#marker-comparison-list).|
+|**E:** Frame summary| Displays a summary of frame times. For more information on this pane, see the documentation on [Frame Summary](frame-summary.md).|
+|**F:** Thread summary|Displays information about the threads in the data set. For more information, see the documentation on the [Thread Summary pane](thread-summary.md).|
+|**G:** Marker summary| Summarizes the marker data of the current selected item in the **Marker Details** list. For more information, see the [Marker summary](marker-summary.md) documentation.|
+
+### Frame buttons
+
+If the data you analyze in the Profile Analyzer is also loaded into the Profiler window, you can click on the frame buttons in the Profile Analyzer window to jump to the relevant frames in the Profiler.
+
+![Jump to frame button](images/jump-to-frame-button.png)<br/>*The Frame Summary pane with the frame buttons highlighted.*
+
+## Frame range selection
+
+You can limit the analysis to a subset or selection of frames. To do this, you can click and drag on the chart in the Frame Control pane at the top of the **Single** and **Compare** views and select a range, or use the context menu commands to select a range. For more information on using the frame range pane, see the [Frame Control pane](frame-range-selection.md) documentation.
+
+## Filtering
+
+You can also filter the data to limit the number of markers the Profile Analyzer displays. This includes filtering by thread, call depth and name substrings. You can order the remaining markers by any of the available metrics in the marker list control. For more information on how to use the filter system, see the [Filters pane](filtering-system.md) documentation.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/single-view.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/single-view.md
new file mode 100644
index 0000000..fa63a10
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/single-view.md
@@ -0,0 +1,100 @@
+# Single view
+
+The **Single** view displays information about a single set of profiling data. You can use it to analyze how markers perform across frames. The view is divided into several frames, which contain information on frame timings, as well as min, max, median, mean, and lower / upper quartile values for frames, threads, and markers.
+
+For information on navigating the window, see the [Profile Analyzer window navigation](profile-analyzer-window.html/#window-navigation) documentation.
+
+![Single View](images/profile-analyzer-single-view.png)<br/> *The Single view in the Profile Analyzer window, with some data loaded*
+
+## Loading data
+
+To load data into the **Single** view, select the **Pull Data** button in the frame control pane, and the Profile Analyzer pulls in any data in the [Profiler](https://docs.unity3d.com/Manual/Profiler.html) window. Alternatively, select the **Load** button to load Profile Analyzer (.pdata) data you have saved from a previous session. 
+
+>[!NOTE]
+>If you select the **Load** option, the data must be in the Profile Analyzer .pdata format. If you have data from the Profiler in the .data file format, open it in the Profiler first, and then select the **Pull Data** button in the Profile Analyzer.
+
+For more information on how to pull data into the Profile Analyzer, see the workflow documentation on [Collecting and viewing data](collecting-and-viewing-data.md).
+
+## Marker details list
+
+The **Marker details** pane contains a sortable list of markers with a number of useful statistics. If you select a marker in the list, the **Marker Summary** panel displays in depth information on the marker. Each marker in the list is an aggregation of all the instances of that marker, across all filtered threads and in all ranged frames.
+
+You can filter the columns in the **Marker details** to a more relevant set. This is particularly useful if you want to filter out irrelevant data when you look for **Time** or **Count** values.  To filter the columns, select the **Marker columns** dropdown from the **Filters** pane.  For more information on how to filter data, see the [Filters](filtering-system.md) documentation.
+
+### Marker details columns and groups
+
+By default, the **Marker columns** dropdown in the **Filters** pane has six preset column layouts that you can use to adjust the layout of the **Marker details** pane. They are:
+
+* **Time and count:** Displays information on the average timings and number of times the markers were called.
+* **Time:** Displays information on the average timings of the markers. 
+* **Totals:** Displays information about the total amount of time the markers took on the whole data set.
+* **Time with totals:** Displays information about both the average and total times of the markers. 
+* **Count totals:** Displays information about the total number of times the markers were called.
+* **Count per frame:** Displays information on the average total per frame the markers were called. 
+* **Depths:** Displays information on where the markers are in the Hierarchy. For more information, see the documentation on Depth Slices in [Filters pane](filtering-system.html#depth-slice).
+* **Threads:** Displays the name of the thread that the markers appear on. For more information, see the documentation on the Thread window in [Filters pane](filtering-system.html#thread-window).
+
+You can also use the **Custom** column layout, to select your own custom mix of columns to add to the layout. To do this, right-click on the header of any column, and manually enable or disable any of the columns as necessary. 
+
+The following table shows the columns that the Profile Analyzer displays when you select that layout.
+
+||**Time and count**|**Time**|**Totals**|**Time with totals**|**Count totals**|**Count per frame**|**Depths**|**Threads**|**Custom only**|
+|---|---|---|---|---|---|---|---|---|---|
+|**Marker Name**|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;||
+|**Depth**|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|&#10003;|||
+|**Median**|&#10003;|&#10003;||&#10003;||||||
+|**Median Bar**|&#10003;|&#10003;||&#10003;||||||
+|**Mean**|&#10003;|||||||||
+|**SD**|||||||||&#10003;|
+|**Min**|&#10003;|&#10003;||&#10003;||||||
+|**Max**|&#10003;|&#10003;||&#10003;||||||
+|**Range**|&#10003;|&#10003;||&#10003;|||||
+|**Count**|&#10003;||||&#10003;|||||
+|**Count Bar**|||||&#10003;|||||
+|**Count Frame**|&#10003;|||||&#10003;||||
+|**Count Frame Bar**||||||&#10003;||||
+|**Count SD**|||||||||&#10003;|
+|**1st**|||||||&#10003;||||
+|**At Median Frame**|&#10003;|&#10003;||&#10003;||||||
+|**Total**|||&#10003;|&#10003;||||||
+|**Total Bar**|||&#10003;|&#10003;||||||
+|**Threads**||||||||&#10003;||
+
+The following table explains what each column does:
+
+|**Column**|**Description**|
+|---|---|
+|**Marker Name**| Displays the name of the marker.|
+|**Depth**|The depth in the hierarchy that the marker appears on.|
+|**Median**| The median value of the marker's time distribution.|
+|**Median Bar**| A visualization of the **Median** value.|
+|**Mean**| The average value of the marker's time distribution.|
+|**SD**| The standard deviation of the marker's time distribution.|
+|**Min**| The minimum value of the marker's time distribution.|
+|**Max**| The maximum value of the marker's time distribution.|
+|**Range**| The difference between the marker's **Min** and **Max** timings.|
+|**Count**| The number of times the marker was pushed / popped.|
+|**Count Bar**|A visualization of the **Count** value. |
+|**Count Frame**|The average number of times per frame that the marker was pushed/popped.|
+|**Count Frame Bar**|A visualization of the **Count Frame** value.|
+|**Count SD**|The standard deviation of **Count** value.|
+|**1st**| The frame number in which the marker first was pushed / popped.|
+|**At Median Frame**| The sum of activity for the marker in the median frame.|
+|**Total**| The total time spent for this marker in all selected frames.|
+|**Total Bar**|A visualization of the **Total** value.|
+|**Threads**|The name of the thread that the marker appears on.|
+
+### Marker Details context menu commands
+
+If you right click on a marker in the **Marker Details** list you can control the filter and list even further.
+
+|**Command**|**Function**|
+|---|---|
+|**Select Frames that contain this marker (within whole data set)**| Select all the frames from the entire data set that contain an instance of this marker.|
+|**Select Frames that contain this marker (within current selection)**| Select all the frames from a selected range of data that contain an instance of this marker.|
+|**Select All**| Selects the entire data set, if you have a range of data selected.|
+|**Add to / Remove From Include Filter**| Add or remove the selected marker to the **Include** filter. This filters the marker list to only markers that match.|
+|**Add to Exclude Filter**| Add the selected marker to the **Exclude** filter. This removes the marker from the marker list. This is useful if you want to remove markers that are using up resources and skewing the markers that you are interested in.|
+|**Set as Parent Marker Filter**| Limit the analysis to this marker and markers included below it on the callstack. For more information, see the [Parent Marker](filtering-system.html#parent-marker) documentation on the Filters page.|
+|**Clear Parent Marker Filter**| Select this to clear the marker as a parent marker filter.|
+|**Copy To Clipboard**| Copies the selected value to the clipboard.|
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/statistics.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/statistics.md
new file mode 100644
index 0000000..57e6c27
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/statistics.md
@@ -0,0 +1,52 @@
+# Statistics in the Profile Analyzer
+
+The Profile Analyzer displays a number of statistics about the data you're analyzing in the Frame, Thread, and Marker Summary panes.. 
+
+## Available statistics
+
+|**Statistic**|**Description**|
+|---|---|
+|**Min**| Min represents the lowest (minimum) value for the marker or frame time.|
+|**Max**| Max represents the largest (maximum) value for the marker or frame time.|
+|**Median**|[Median](https://en.wikipedia.org/wiki/Median) is the middle value of a data set, and separates the higher half from the lower half of a data set. |
+|**Mean**| [Mean](https://en.wikipedia.org/wiki/Arithmetic_mean) is the average value in a data set. It represents the sum of all of the values in the data set divided by the number of values in the data set.|
+|**Lower and Upper Quartiles**|The lower [quartile](https://en.wikipedia.org/wiki/Quartile) is the middle number between the smallest number and the median of the data set. The upper quartile is the middle value between the median and the highest value of the data set.|
+|**Interquartile Range**| The [interquartile range](https://en.wikipedia.org/wiki/Interquartile_range) shows the range of values in the central 50% of the data. The range is equal to the difference between the upper and lower quartile values. |
+
+## How the statistics are represented
+
+The statistics are displayed in several ways in the Profile Analyzer. In the Frame, Thread, and Marker summary panes, the statistics are displayed as raw numbers as well as in [histograms](https://en.wikipedia.org/wiki/Histogram) and [box and whisker plots](https://en.wikipedia.org/wiki/Box_plot) to give a visual representation of time distribution. The following section gives some examples of some common distributions you might find in your analysis.
+
+## Single view
+
+### Even distribution
+
+![Even distribution](images/even-distribution.png)
+
+In this example, the graphs display a distribution of marker calls that range from 16.75ms to 17.26ms. The histogram on the left shows that a lot of the buckets are being hit at a fairly even amount. This is also evident in the box and whisker plot on the right where the box is large and is towards the middle of the upper and lower bounds.
+
+### Outlier
+
+![Outlier distribution](images/outlier.png)
+
+In this example, the graphs display a distribution of marker calls that range from 0.67ms to 5.32ms. The histogram on the left shows that the lower end buckets are used the most and only some of the more expensive buckets are hit. This is also reflected in the box and whisker plot, where the box appears towards the bottom of the range but the whisker, or upper bound of the range, is high up.
+
+## Compare view
+
+### Similar distribution
+
+![Similar distribution](images/similar-distributions.png)
+
+In this example, there are two distributions that are similar, and both the histogram and box and whisker plots show a very similar pattern. This shows that the marker activity in both sets is similar.
+
+### Different distribution
+
+![Different distributions](images/different-distributions.png)
+
+In this example, there are two distributions that are different; both the histogram and the box and whisker plots show that the marker in the left (blue) data set ran for longer. The histogram shows that the blue data set used more expensive buckets, and the box and whisker plot is drawn higher up on its range. This means that the marker activity in left (blue) data set is more costly and should be investigated further.
+
+### Overlapping distributions
+
+![Overlapping distributions](images/overlapping-distributions.png)
+
+In this example, there are two distributions that are similar. Both data sets have the same lower bound and have some overlap in the middle of the range, but the right (orange) dataset uses some of the more expensive buckets and has a higher upper bound. This means that the activity in right (orange) data set is more costly or is being called more times and should be investigated further.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/thread-summary.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/thread-summary.md
new file mode 100644
index 0000000..140c7bd
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/thread-summary.md
@@ -0,0 +1,18 @@
+# Thread Summary
+
+The Thread Summary pane displays information about the threads in the data set. You can use the information in this pane to compare and understand the number of threads used in the data set.
+
+By default, the Profile Analyzer only displays information about the Main Thread. To add more threads to the analysis, use the **Thread** button in the Filters pane. For more information, see the documentation on the [Filters pane](filtering-system.html/#thread-window).
+
+![Thread Summary](images/thread-summary.png)<br/>*The Thread Summary pane in Single View (left), and Compare View (right)*
+
+## Statistics
+
+|**Statistic**|**Description**|
+|---|---|
+|**Total Count**|The total number of threads in the data set, or data selection. The Compare view also has a **Total** column, which displays the total count for all threads across both data sets.|
+|**Unique Count**<br/>*(Compare view only)*|The number of unique threads in each data set. A unique thread is one that is not in the other data set. The **Total** column displays the total of unique threads across both data sets.|
+|**Selected**|The number of threads selected in the data set. To add more threads use the **Thread** button in the [Filters pane](filtering-system.html/#thread-window).|
+|**Graph Scale**|Select a scale for the plot. You can choose from:<br/> **Median frame time**<br/>**Upper quartile of frame time**</br>**Max frame time**.|
+
+At the bottom of the pane, there is a summary of the median run time of the current filtered threads with a box and whisker plot of them. You can use these graphs to analyze which threads Unity spends the most time on.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/upgrade-guide.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/upgrade-guide.md
new file mode 100644
index 0000000..2d661ed
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/upgrade-guide.md
@@ -0,0 +1,3 @@
+# Profile Analyzer upgrade guide
+
+You do not need to take any actions to upgrade your project when you update this package.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/whats-new.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/whats-new.md
new file mode 100644
index 0000000..601e88b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Documentation~/whats-new.md
@@ -0,0 +1,13 @@
+# What's new in 1.2.2
+
+Summary of changes in Profile Analyzer version 1.2.2.
+
+The main updates in this release include:
+
+## Added 
+
+* Added support for removing vsync time, so we can see actual CPU duration over multiple frames. A drop down has been added to 'remove' a marker from the analysis and has entries for "FPS Wait", "Present Wait" and "Custom" where you can select any marker from the table using the right click context menu to "Remove Marker".
+* Added optional standard deviation (SD) column into marker table (on single view) for sorting data based on variation of marker timings in over the frames.
+* Added export of the comparison table as CSV.
+
+For a full list of changes and updates in this version, see the [Profile Analyzer package changelog](https://docs.unity3d.com/Packages/com.unity.performance.profile-analyzer@latest/index.html?subfolder=/changelog/CHANGELOG.html).
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor.meta
new file mode 100644
index 0000000..42c3e74
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6867c2662acbb4810a369aba450b6776
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Analytics.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Analytics.cs
new file mode 100644
index 0000000..6f77d39
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Analytics.cs
@@ -0,0 +1,373 @@
+using System;
+using System.Collections.Generic;
+using UnityEditor.Analytics;
+using UnityEngine;
+using UnityEngine.Analytics;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    class ProfileAnalyzerAnalytics
+    {
+        const int k_MaxEventsPerHour = 100;
+        const int k_MaxEventItems = 1000;
+        const string k_VendorKey = "unity.profileanalyzer";
+        const string k_EventTopicName = "usability";
+
+        static bool s_EnableAnalytics = false;
+
+        public static void EnableAnalytics()
+        {
+            AnalyticsResult result = EditorAnalytics.RegisterEventWithLimit(k_EventTopicName, k_MaxEventsPerHour, k_MaxEventItems, k_VendorKey);
+            if (result == AnalyticsResult.Ok)
+                s_EnableAnalytics = true;
+        }
+
+        public enum UIButton
+        {
+            Pull,
+            OpenProfiler,
+            CloseProfiler,
+            JumpToFrame,
+            ExportSingleFrames,
+            ExportComparisonFrames,
+        };
+
+        public enum UIUsageMode
+        {
+            Single,
+            Comparison,
+        };
+
+        public enum UIVisibility
+        {
+            FrameTimeContextMenu,
+            Filters,
+            TopTen,
+            Frames,
+            Threads,
+            Markers,
+        };
+
+        public enum UIResizeView
+        {
+            Single,
+            Comparison,
+        };
+
+
+        [Serializable]
+        struct ProfileAnalyzerUIButtonEventParameters
+        {
+            public string name;
+
+            public ProfileAnalyzerUIButtonEventParameters(string name)
+            {
+                this.name = name;
+            }
+        }
+
+        // camelCase since these events get serialized to Json and naming convention in analytics is camelCase
+        [Serializable]
+        struct ProfileAnalyzerUIButtonEvent
+        {
+            public ProfileAnalyzerUIButtonEvent(string name, float durationInTicks)
+            {
+                subtype = "profileAnalyzerUIButton";
+
+                // ts is auto added so no need to include it here
+                //ts = (int)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
+                this.duration = durationInTicks;
+
+                parameters = new ProfileAnalyzerUIButtonEventParameters(name);
+            }
+
+            public string subtype;
+            //public int ts;
+            public float duration;  // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            public ProfileAnalyzerUIButtonEventParameters parameters;
+        }
+
+        [Serializable]
+        struct ProfileAnalyzerUIUsageEventParameters
+        {
+            public string name;
+
+            public ProfileAnalyzerUIUsageEventParameters(string name)
+            {
+                this.name = name;
+            }
+        }
+
+        [Serializable]
+        struct ProfileAnalyzerUIUsageEvent
+        {
+            public ProfileAnalyzerUIUsageEvent(string name, float durationInTicks)
+            {
+                subtype = "profileAnalyzerModeUsage";
+
+                this.duration = durationInTicks;
+
+                parameters = new ProfileAnalyzerUIUsageEventParameters(name);
+            }
+
+            public string subtype;
+            public float duration;  // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            public ProfileAnalyzerUIUsageEventParameters parameters;
+        }
+
+        [Serializable]
+        struct ProfileAnalyzerUIVisibilityEventParameters
+        {
+            public string name;
+            public bool show;
+
+            public ProfileAnalyzerUIVisibilityEventParameters(string name, bool show)
+            {
+                this.name = name;
+                this.show = show;
+            }
+        }
+
+        [Serializable]
+        struct ProfileAnalyzerUIVisibilityEvent
+        {
+            public ProfileAnalyzerUIVisibilityEvent(string name, float durationInTicks, bool show)
+            {
+                subtype = "profileAnalyzerUIVisibility";
+
+                this.duration = durationInTicks;
+
+                parameters = new ProfileAnalyzerUIVisibilityEventParameters(name, show);
+            }
+
+            public string subtype;
+            public float duration;  // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            public ProfileAnalyzerUIVisibilityEventParameters parameters;
+        }
+
+        [Serializable]
+        struct ProfileAnalyzerUIResizeEventParameters
+        {
+            public string name;
+            public float width;
+            public float height;
+            public float screenWidth;
+            public float screenHeight;
+            public bool docked;
+
+            public ProfileAnalyzerUIResizeEventParameters(string name, float width, float height, float screenWidth, float screenHeight, bool isDocked)
+            {
+                this.name = name;
+                this.width = width;
+                this.height = height;
+                this.screenWidth = screenWidth;
+                this.screenHeight = screenHeight;
+                docked = isDocked;
+            }
+        }
+
+        [Serializable]
+        struct ProfileAnalyzerUIResizeEvent
+        {
+            public ProfileAnalyzerUIResizeEvent(string name, float durationInTicks, float width, float height, float screenWidth, float screenHeight, bool isDocked)
+            {
+                subtype = "profileAnalyzerUIResize";
+
+                this.duration = durationInTicks;
+
+                parameters = new ProfileAnalyzerUIResizeEventParameters(name, width, height, screenWidth, screenHeight, isDocked);
+            }
+
+            public string subtype;
+            public float duration;  // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            public ProfileAnalyzerUIResizeEventParameters parameters;
+        }
+
+        static float SecondsToTicks(float durationInSeconds)
+        {
+            return durationInSeconds * 10000;
+        }
+
+        public static bool SendUIButtonEvent(UIButton uiButton, float durationInSeconds)
+        {
+            if (!s_EnableAnalytics)
+                return false;
+
+            // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            float durationInTicks = SecondsToTicks(durationInSeconds);
+
+            ProfileAnalyzerUIButtonEvent uiButtonEvent;
+            switch (uiButton)
+            {
+                case UIButton.Pull:
+                    uiButtonEvent = new ProfileAnalyzerUIButtonEvent("profilerAnalyzerGrab", durationInTicks);
+                    break;
+                case UIButton.OpenProfiler:
+                    uiButtonEvent = new ProfileAnalyzerUIButtonEvent("profilerAnalyzerOpenProfiler", durationInTicks);
+                    break;
+                case UIButton.CloseProfiler:
+                    uiButtonEvent = new ProfileAnalyzerUIButtonEvent("profilerAnalyzerCloseProfiler", durationInTicks);
+                    break;
+                case UIButton.JumpToFrame:
+                    uiButtonEvent = new ProfileAnalyzerUIButtonEvent("profilerAnalyzerJumpToFrame", durationInTicks);
+                    break;
+                case UIButton.ExportSingleFrames:
+                    uiButtonEvent = new ProfileAnalyzerUIButtonEvent("profilerAnalyzerExportSingleFrames", durationInTicks);
+                    break;
+                case UIButton.ExportComparisonFrames:
+                    uiButtonEvent = new ProfileAnalyzerUIButtonEvent("profilerAnalyzerExportComparisonFrames", durationInTicks);
+                    break;
+                default:
+                    Debug.LogFormat("SendUIButtonEvent: Unsupported button type : {0}", uiButton);
+                    return false;
+            }
+
+
+            AnalyticsResult result = EditorAnalytics.SendEventWithLimit(k_EventTopicName, uiButtonEvent);
+            if (result != AnalyticsResult.Ok)
+                return false;
+
+            return true;
+        }
+
+        public static bool SendUIUsageModeEvent(UIUsageMode uiUsageMode, float durationInSeconds)
+        {
+            if (!s_EnableAnalytics)
+                return false;
+
+            // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            float durationInTicks = SecondsToTicks(durationInSeconds);
+
+            ProfileAnalyzerUIUsageEvent uiUsageEvent;
+            switch (uiUsageMode)
+            {
+                case UIUsageMode.Single:
+                    uiUsageEvent = new ProfileAnalyzerUIUsageEvent("profileAnalyzerSingle", durationInTicks);
+                    break;
+                case UIUsageMode.Comparison:
+                    uiUsageEvent = new ProfileAnalyzerUIUsageEvent("profileAnalyzerCompare", durationInTicks);
+                    break;
+                default:
+                    Debug.LogFormat("SendUsageEvent: Unsupported usage mode : {0}", uiUsageMode);
+                    return false;
+            }
+
+
+            AnalyticsResult result = EditorAnalytics.SendEventWithLimit(k_EventTopicName, uiUsageEvent);
+            if (result != AnalyticsResult.Ok)
+                return false;
+
+            return true;
+        }
+
+        public static bool SendUIVisibilityEvent(UIVisibility uiVisibility, float durationInSeconds, bool show)
+        {
+            if (!s_EnableAnalytics)
+                return false;
+
+            // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            float durationInTicks = SecondsToTicks(durationInSeconds);
+
+            ProfileAnalyzerUIVisibilityEvent uiUsageEvent;
+            switch (uiVisibility)
+            {
+                case UIVisibility.FrameTimeContextMenu:
+                    uiUsageEvent = new ProfileAnalyzerUIVisibilityEvent("profilerAnalyzerFrameTimeContextMenu", durationInTicks, show);
+                    break;
+                case UIVisibility.Filters:
+                    uiUsageEvent = new ProfileAnalyzerUIVisibilityEvent("profilerAnalyzerFilters", durationInTicks, show);
+                    break;
+                case UIVisibility.TopTen:
+                    uiUsageEvent = new ProfileAnalyzerUIVisibilityEvent("profilerAnalyzerTopTen", durationInTicks, show);
+                    break;
+                case UIVisibility.Frames:
+                    uiUsageEvent = new ProfileAnalyzerUIVisibilityEvent("profilerAnalyzerFrames", durationInTicks, show);
+                    break;
+                case UIVisibility.Threads:
+                    uiUsageEvent = new ProfileAnalyzerUIVisibilityEvent("profilerAnalyzerThreads", durationInTicks, show);
+                    break;
+                case UIVisibility.Markers:
+                    uiUsageEvent = new ProfileAnalyzerUIVisibilityEvent("profilerAnalyzerMarkers", durationInTicks, show);
+                    break;
+                default:
+                    Debug.LogFormat("SendUIVisibilityEvent: Unsupported visibililty item : {0}", uiVisibility);
+                    return false;
+            }
+
+            AnalyticsResult result = EditorAnalytics.SendEventWithLimit(k_EventTopicName, uiUsageEvent);
+            if (result != AnalyticsResult.Ok)
+                return false;
+
+            return true;
+        }
+
+        public static bool SendUIResizeEvent(UIResizeView uiResizeView, float durationInSeconds, float width, float height, bool isDocked)
+        {
+            if (!s_EnableAnalytics)
+                return false;
+
+            // Duration is in "ticks" 100 nanosecond intervals. I.e. 0.1 microseconds
+            float durationInTicks = SecondsToTicks(durationInSeconds);
+
+            ProfileAnalyzerUIResizeEvent uiResizeEvent;
+            switch (uiResizeView)
+            {
+                case UIResizeView.Single:
+                    // Screen.width, Screen.height is game view size
+                    uiResizeEvent = new ProfileAnalyzerUIResizeEvent("profileAnalyzerSingle", durationInTicks, width, height, Screen.currentResolution.width, Screen.currentResolution.height, isDocked);
+                    break;
+                case UIResizeView.Comparison:
+                    uiResizeEvent = new ProfileAnalyzerUIResizeEvent("profileAnalyzerCompare", durationInTicks, width, height, Screen.currentResolution.width, Screen.currentResolution.height, isDocked);
+                    break;
+                default:
+                    Debug.LogFormat("SendUIResizeEvent: Unsupported view : {0}", uiResizeView);
+                    return false;
+            }
+
+            AnalyticsResult result = EditorAnalytics.SendEventWithLimit(k_EventTopicName, uiResizeEvent);
+            if (result != AnalyticsResult.Ok)
+                return false;
+
+            return true;
+        }
+
+        internal class Analytic
+        {
+            double m_StartTime;
+            float m_DurationInSeconds;
+
+            public Analytic()
+            {
+                m_StartTime = EditorApplication.timeSinceStartup;
+                m_DurationInSeconds = 0;
+            }
+
+            public void End()
+            {
+                m_DurationInSeconds = (float)(EditorApplication.timeSinceStartup - m_StartTime);
+            }
+
+            public float GetDurationInSeconds()
+            {
+                return m_DurationInSeconds;
+            }
+        }
+
+        static public Analytic BeginAnalytic()
+        {
+            return new Analytic();
+        }
+
+        static public void SendUIButtonEvent(UIButton uiButton, Analytic instance)
+        {
+            instance.End();
+            SendUIButtonEvent(uiButton, instance.GetDurationInSeconds());
+        }
+
+        static public void SendUIUsageModeEvent(UIUsageMode uiUsageMode, Analytic instance)
+        {
+            instance.End();
+            SendUIUsageModeEvent(uiUsageMode, instance.GetDurationInSeconds());
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Analytics.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Analytics.cs.meta
new file mode 100644
index 0000000..89a639d
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Analytics.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: adf9820979228054693ce2e8224012fb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/AssemblyInfo.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/AssemblyInfo.cs
new file mode 100644
index 0000000..c0be543
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Unity.Performance.Profile-Analyzer.EditorTests")]
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/AssemblyInfo.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/AssemblyInfo.cs.meta
new file mode 100644
index 0000000..3c3e820
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/AssemblyInfo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dcb585fc3518ff949912f2d4fff2e26f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/BoxAndWhiskerPlot.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/BoxAndWhiskerPlot.cs
new file mode 100644
index 0000000..3c11ebc
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/BoxAndWhiskerPlot.cs
@@ -0,0 +1,240 @@
+using UnityEngine;
+using System;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class BoxAndWhiskerPlot
+    {
+        Draw2D m_2D;
+
+        Color m_ColorBackground;
+        DisplayUnits m_Units;
+
+        string DisplayUnits()
+        {
+            return m_Units.Postfix();
+        }
+
+        string ToDisplayUnits(float ms, bool showUnits = false)
+        {
+            return m_Units.ToString(ms, showUnits, 5, true);
+        }
+
+        string ToTooltipDisplayUnits(float ms, bool showUnits = false)
+        {
+            return m_Units.ToTooltipString(ms, showUnits);
+        }
+
+        public void SetUnits(Units units)
+        {
+            m_Units = new DisplayUnits(units);
+        }
+
+        public BoxAndWhiskerPlot(Draw2D draw2D, Units units, Color colorBackground)
+        {
+            m_2D = draw2D;
+            SetUnits(units);
+            m_ColorBackground = colorBackground;
+        }
+
+        public BoxAndWhiskerPlot(Draw2D draw2D, Units units)
+        {
+            m_2D = draw2D;
+            SetUnits(units);
+            m_ColorBackground = new Color(0.4f, 0.4f, 0.4f);
+        }
+
+        float ClampToRange(float value, float min, float max)
+        {
+            return Math.Max(min, Math.Min(value, max));
+        }
+
+        public void Draw(float width, float height, float min, float lowerQuartile, float median, float upperQuartile, float max, float yAxisStart, float yAxisEnd, Color color, Color colorFilled)
+        {
+            if (m_2D.DrawStart(width, height, Draw2D.Origin.BottomLeft))
+            {
+                Rect rect = GUILayoutUtility.GetLastRect();
+
+                float x = 0;
+                float y = 0;
+                float w = width;
+                float h = height;
+
+                Draw(rect, x, y, w, h, min, lowerQuartile, median, upperQuartile, max, yAxisStart, yAxisEnd, color, colorFilled);
+                m_2D.DrawEnd();
+            }
+        }
+
+        string GetTooltip(float min, float lowerQuartile, float median, float upperQuartile, float max)
+        {
+            string tooltip = string.Format(
+                "Max :\t\t{0}\n\nUpper Quartile :\t{1}\nMedian :\t\t{2}\nLower Quartile :\t{3}\nInterquartile range : \t{4}\n\nMin :\t\t{5}\nUnits :\t\t{6}",
+                ToTooltipDisplayUnits(max),
+                ToTooltipDisplayUnits(upperQuartile),
+                ToTooltipDisplayUnits(median),
+                ToTooltipDisplayUnits(lowerQuartile),
+                ToTooltipDisplayUnits(upperQuartile - lowerQuartile),
+                ToTooltipDisplayUnits(min),
+                m_Units.Postfix()
+            );
+
+            return tooltip;
+        }
+
+        public void Draw(Rect rect, float x, float y, float w, float h, float min, float lowerQuartile, float median, float upperQuartile, float max, float yAxisStart, float yAxisEnd, Color color, Color colorFilled, bool clearFirst = true)
+        {
+            string tooltip = GetTooltip(min, lowerQuartile, median, upperQuartile, max);
+            GUI.Label(rect, new GUIContent("", tooltip));
+
+            if (clearFirst)
+                m_2D.DrawFilledBox(x, y, w, h, m_ColorBackground);
+
+            float first = yAxisStart;
+            float last = yAxisEnd;
+            float range = last - first;
+
+            bool startCap = (min >= first) ? true : false;
+            bool endCap = (max <= last) ? true : false;
+
+            // Range clamping
+            min = ClampToRange(min, first, last);
+            lowerQuartile = ClampToRange(lowerQuartile, first, last);
+            median = ClampToRange(median, first, last);
+            upperQuartile = ClampToRange(upperQuartile, first, last);
+            max = ClampToRange(max, first, last);
+
+            float hMax = h - 1;
+            float yMin = hMax * (min - first) / range;
+            float yLowerQuartile = hMax * (lowerQuartile - first) / range;
+            float yMedian = hMax * (median - first) / range;
+            float yUpperQuartile = hMax * (upperQuartile - first) / range;
+            float yMax = hMax * (max - first) / range;
+
+            // Min to max line
+            float xCentre = x + (w / 2);
+            m_2D.DrawLine(xCentre, y + yMin, xCentre, y + yLowerQuartile, color);
+            m_2D.DrawLine(xCentre, y + yUpperQuartile, xCentre, y + yMax, color);
+
+            // Quartile boxes
+            float xMargin = (2 * w / 8);
+            float x1 = x + xMargin;
+            float x2 = x + (w - xMargin);
+            float wBox = x2 - x1;
+            if (colorFilled != color)
+                m_2D.DrawFilledBox(x1, y + yLowerQuartile, wBox, (yMedian - yLowerQuartile), colorFilled);
+            m_2D.DrawBox(x1, y + yLowerQuartile, wBox, (yMedian - yLowerQuartile), color);
+            if (colorFilled != color)
+                m_2D.DrawFilledBox(x1, y + yMedian, wBox, (yUpperQuartile - yMedian), colorFilled);
+            m_2D.DrawBox(x1, y + yMedian, wBox, (yUpperQuartile - yMedian), color);
+
+            // Median line
+            //xMargin = (1 * w / 8);
+            //x1 = x + xMargin;
+            //x2 = x + (w - xMargin);
+            m_2D.DrawLine(x1, y + yMedian, x2, y + yMedian, color);
+            m_2D.DrawLine(x1, y + yMedian + 1, x2, y + yMedian + 1, color);
+
+            // Line caps
+            xMargin = (3 * w / 8);
+            x1 = x + xMargin;
+            x2 = x + (w - xMargin);
+            if (startCap)
+                m_2D.DrawLine(x1, y + yMin, x2, y + yMin, color);
+
+            if (endCap)
+                m_2D.DrawLine(x1, y + yMax, x2, y + yMax, color);
+        }
+
+        public void DrawHorizontal(float width, float height, float min, float lowerQuartile, float median, float upperQuartile, float max, float xAxisStart, float xAxisEnd, Color color, Color colorFilled, GUIStyle style = null)
+        {
+            if (m_2D.DrawStart(width, height, Draw2D.Origin.BottomLeft, style))
+            {
+                Rect rect = GUILayoutUtility.GetLastRect();
+
+                float x = 0;
+                float y = 0;
+                float w = width;
+                float h = height;
+
+                DrawHorizontal(rect, x, y, w, h, min, lowerQuartile, median, upperQuartile, max, xAxisStart, xAxisEnd, color, colorFilled);
+                m_2D.DrawEnd();
+            }
+        }
+
+        public void DrawHorizontal(Rect rect, float x, float y, float w, float h, float min, float lowerQuartile, float median, float upperQuartile, float max, float xAxisStart, float xAxisEnd, Color color, Color colorFilled, bool clearFirst = true)
+        {
+            string tooltip = GetTooltip(min, lowerQuartile, median, upperQuartile, max);
+            GUI.Label(rect, new GUIContent("", tooltip));
+
+            if (clearFirst)
+                m_2D.DrawFilledBox(x, y, w, h, m_ColorBackground);
+
+            float first = xAxisStart;
+            float last = xAxisEnd;
+            float range = last - first;
+
+            bool startCap = (min >= first) ? true : false;
+            bool endCap = (max <= last) ? true : false;
+
+            // Range clamping
+            min = ClampToRange(min, first, last);
+            lowerQuartile = ClampToRange(lowerQuartile, first, last);
+            median = ClampToRange(median, first, last);
+            upperQuartile = ClampToRange(upperQuartile, first, last);
+            max = ClampToRange(max, first, last);
+
+            float xMin = w * (min - first) / range;
+            float xLowerQuartile = w * (lowerQuartile - first) / range;
+            float xMedian = w * (median - first) / range;
+            float xUpperQuartile = w * (upperQuartile - first) / range;
+            float xMax = w * (max - first) / range;
+
+            // Min to max line
+            m_2D.DrawLine(x + xMin, y + (h / 2), x + xMax, y + (h / 2), color);
+
+            // Quartile boxes
+            float yMargin = (2 * h / 8);
+            float y1 = y + yMargin;
+            float y2 = y + (h - yMargin);
+            float hBox = y2 - y1;
+            if (colorFilled != color)
+                m_2D.DrawFilledBox(x + xLowerQuartile, y1, xMedian - xLowerQuartile, hBox, colorFilled);
+            m_2D.DrawBox(x + xLowerQuartile, y1, xMedian - xLowerQuartile, hBox, color);
+            if (colorFilled != color)
+                m_2D.DrawFilledBox(x + xMedian, y1, xUpperQuartile - xMedian, hBox, colorFilled);
+            m_2D.DrawBox(x + xMedian, y1, xUpperQuartile - xMedian, hBox, color);
+
+            // Median line
+            //yMargin = (1 * h / 8);
+            //y1 = y + yMargin;
+            //y2 = y + (h - yMargin);
+            m_2D.DrawLine(x + xMedian, y1, x + xMedian, y2, color);
+            m_2D.DrawLine(x + xMedian + 1, y1, x + xMedian + 1, y2, color);
+
+            // Line caps
+            yMargin = (3 * h / 8);
+            y1 = y + yMargin;
+            y2 = y + (h - yMargin);
+            if (startCap)
+                m_2D.DrawLine(x + xMin, y1, x + xMin, y2, color);
+
+            if (endCap)
+                m_2D.DrawLine(x + xMax, y1, x + xMax, y2, color);
+        }
+
+        public void DrawText(float width, float plotHeight, float min, float max, string minTooltip, string maxTooltip)
+        {
+            GUIStyle shiftUpStyle = new GUIStyle(GUI.skin.label);
+            shiftUpStyle.contentOffset = new Vector2(0, -5);
+            shiftUpStyle.alignment = TextAnchor.UpperLeft;
+            EditorGUILayout.BeginVertical(GUILayout.Height(plotHeight));
+            EditorGUILayout.LabelField(new GUIContent(ToDisplayUnits(max), maxTooltip), shiftUpStyle, GUILayout.Width(width));
+            GUILayout.FlexibleSpace();
+            GUIStyle shiftDownStyle = new GUIStyle(GUI.skin.label);
+            shiftDownStyle.contentOffset = new Vector2(0, 1);
+            shiftDownStyle.alignment = TextAnchor.LowerLeft;
+            EditorGUILayout.LabelField(new GUIContent(ToDisplayUnits(min), minTooltip), shiftDownStyle, GUILayout.Width(width));
+            EditorGUILayout.EndVertical();
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/BoxAndWhiskerPlot.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/BoxAndWhiskerPlot.cs.meta
new file mode 100644
index 0000000..6d474ef
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/BoxAndWhiskerPlot.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ae5c414d7d406467d8ce01807c211f90
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Columns.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Columns.cs
new file mode 100644
index 0000000..2b7e76c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Columns.cs
@@ -0,0 +1,184 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using System;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class Columns
+    {
+        int[] m_ColumnWidth = new int[4];
+
+        public Columns(int a, int b, int c, int d)
+        {
+            SetColumnSizes(a, b, c, d);
+        }
+
+        public void SetColumnSizes(int a, int b, int c, int d)
+        {
+            m_ColumnWidth[0] = a;
+            m_ColumnWidth[1] = b;
+            m_ColumnWidth[2] = c;
+            m_ColumnWidth[3] = d;
+        }
+
+        public int GetColumnWidth(int n)
+        {
+            if (n < 0 || n >= m_ColumnWidth.Length)
+                return 0;
+
+            return m_ColumnWidth[n];
+        }
+
+        public void Draw(int n, string col)
+        {
+            if (n < 0 || n >= m_ColumnWidth.Length || m_ColumnWidth[n] <= 0)
+                EditorGUILayout.LabelField(col);
+
+            EditorGUILayout.LabelField(col, GUILayout.Width(m_ColumnWidth[n]));
+        }
+
+        public void Draw(int n, float value)
+        {
+            Draw(n, string.Format("{0:f2}", value));
+        }
+
+        public void Draw2(string col1, string col2)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, col2);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw2(string label, float value)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, label);
+            Draw(1, value);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw3(string col1, string col2, string col3)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, col2);
+            Draw(2, col3);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw3(string col1, float value2, float value3)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, value2);
+            Draw(2, value3);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw4(string col1, string col2, string col3, string col4)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, col2);
+            Draw(2, col3);
+            Draw(3, col4);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw4Diff(string col1, float left, float right)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, left);
+            Draw(2, right);
+            Draw(3, right - left);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw4(string col1, float value2, float value3, float value4)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, value2);
+            Draw(2, value3);
+            Draw(3, value4);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        // GUIContent versions
+        public void Draw(int n, GUIContent col)
+        {
+            if (n < 0 || n >= m_ColumnWidth.Length || m_ColumnWidth[n] <= 0)
+                EditorGUILayout.LabelField(col);
+
+            EditorGUILayout.LabelField(col, GUILayout.Width(m_ColumnWidth[n]));
+        }
+
+        public void Draw2(GUIContent col1, GUIContent col2)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, col2);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw2(GUIContent label, float value)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, label);
+            Draw(1, value);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw3(GUIContent col1, GUIContent col2, GUIContent col3)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, col2);
+            Draw(2, col3);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw3(GUIContent col1, float value2, float value3)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, value2);
+            Draw(2, value3);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw4(GUIContent col1, GUIContent col2, GUIContent col3, GUIContent col4)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, col2);
+            Draw(2, col3);
+            Draw(3, col4);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw4Diff(GUIContent col1, float left, float right)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, left);
+            Draw(2, right);
+            Draw(3, right - left);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void Draw4(GUIContent col1, float value2, float value3, float value4)
+        {
+            EditorGUILayout.BeginHorizontal();
+            Draw(0, col1);
+            Draw(1, value2);
+            Draw(2, value3);
+            Draw(3, value4);
+            EditorGUILayout.EndHorizontal();
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Columns.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Columns.cs.meta
new file mode 100644
index 0000000..165a6d1
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Columns.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a402cbe9b84984bd4a16cb20ca9c3bed
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ComparisonTable.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ComparisonTable.cs
new file mode 100644
index 0000000..a466987
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ComparisonTable.cs
@@ -0,0 +1,1511 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using UnityEditor;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+using UnityEngine.Assertions;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    class ComparisonTreeViewItem : TreeViewItem
+    {
+        public MarkerPairing data { get; set; }
+        public GUIContent[] cachedRowString;
+
+        public ComparisonTreeViewItem(int id, int depth, string displayName, MarkerPairing data) : base(id, depth, displayName)
+        {
+            this.data = data;
+            cachedRowString = null;
+        }
+    }
+
+    class ComparisonTable : TreeView
+    {
+        Draw2D m_2D;
+        ProfileDataView m_LeftDataView;
+        ProfileDataView m_RightDataView;
+        Color m_LeftColor;
+        Color m_RightColor;
+        List<MarkerPairing> m_Pairings;
+        bool m_HideRemovedMarkers;
+        ProfileAnalyzerWindow m_ProfileAnalyzerWindow;
+        float m_DiffRange;
+        float m_CountDiffRange;
+        float m_CountMeanDiffRange;
+        double m_TotalDiffRange;
+
+        const float kRowHeights = 20f;
+        readonly List<TreeViewItem> m_Rows = new List<TreeViewItem>(100);
+
+        // All columns
+        public enum MyColumns
+        {
+            Name,
+            State,
+            LeftMedian,
+            LeftBar,
+            RightBar,
+            RightMedian,
+            Diff,
+            DiffPercent,
+            AbsDiff,
+            LeftCount,
+            LeftCountBar,
+            RightCountBar,
+            RightCount,
+            CountDiff,
+            CountDiffPercent,
+            AbsCountDiff,
+            LeftCountMean,
+            LeftCountMeanBar,
+            RightCountMeanBar,
+            RightCountMean,
+            CountMeanDiff,
+            CountMeanDiffPercent,
+            AbsCountMeanDiff,
+            LeftTotal,
+            LeftTotalBar,
+            RightTotalBar,
+            RightTotal,
+            TotalDiff,
+            TotalDiffPercent,
+            AbsTotalDiff,
+            LeftDepth,
+            RightDepth,
+            DepthDiff,
+            LeftThreads,
+            RightThreads,
+        }
+
+        static int m_MaxColumns;
+
+        public enum SortOption
+        {
+            Name,
+            State,
+            LeftMedian,
+            RightMedian,
+            Diff,
+            ReverseDiff,
+            DiffPercent,
+            AbsDiff,
+            LeftCount,
+            RightCount,
+            CountDiff,
+            ReverseCountDiff,
+            CountDiffPercent,
+            AbsCountDiff,
+            LeftCountMean,
+            RightCountMean,
+            CountMeanDiff,
+            ReverseCountMeanDiff,
+            CountMeanDiffPercent,
+            AbsCountMeanDiff,
+            LeftTotal,
+            RightTotal,
+            TotalDiff,
+            ReverseTotalDiff,
+            TotalDiffPercent,
+            AbsTotalDiff,
+            LeftDepth,
+            RightDepth,
+            DepthDiff,
+            LeftThreads,
+            RightThreads,
+        }
+
+        // Sort options per column
+        SortOption[] m_SortOptions =
+        {
+            SortOption.Name,
+            SortOption.State,
+            SortOption.LeftMedian,
+            SortOption.ReverseDiff,
+            SortOption.Diff,
+            SortOption.RightMedian,
+            SortOption.Diff,
+            SortOption.DiffPercent,
+            SortOption.AbsDiff,
+            SortOption.LeftCount,
+            SortOption.ReverseCountDiff,
+            SortOption.CountDiff,
+            SortOption.RightCount,
+            SortOption.CountDiff,
+            SortOption.CountDiffPercent,
+            SortOption.AbsCountDiff,
+            SortOption.LeftCountMean,
+            SortOption.ReverseCountMeanDiff,
+            SortOption.CountMeanDiff,
+            SortOption.RightCountMean,
+            SortOption.CountMeanDiff,
+            SortOption.CountMeanDiffPercent,
+            SortOption.AbsCountMeanDiff,
+            SortOption.LeftTotal,
+            SortOption.ReverseTotalDiff,
+            SortOption.TotalDiff,
+            SortOption.RightTotal,
+            SortOption.TotalDiff,
+            SortOption.TotalDiffPercent,
+            SortOption.AbsTotalDiff,
+            SortOption.LeftDepth,
+            SortOption.RightDepth,
+            SortOption.DepthDiff,
+            SortOption.LeftThreads,
+            SortOption.RightThreads,
+        };
+
+        internal static class Styles
+        {
+            public static readonly GUIContent menuItemSelectFramesInAll = new GUIContent("Select Frames that contain this marker (within whole data set)", "");
+            public static readonly GUIContent menuItemSelectFramesInCurrent = new GUIContent("Select Frames that contain this marker (within current selection)", "");
+            //public static readonly GUIContent menuItemClearSelection = new GUIContent("Clear Selection");
+            public static readonly GUIContent menuItemSelectFramesAll = new GUIContent("Select All");
+            public static readonly GUIContent menuItemAddToIncludeFilter = new GUIContent("Add to Include Filter", "");
+            public static readonly GUIContent menuItemAddToExcludeFilter = new GUIContent("Add to Exclude Filter", "");
+            public static readonly GUIContent menuItemRemoveFromIncludeFilter = new GUIContent("Remove from Include Filter", "");
+            public static readonly GUIContent menuItemRemoveFromExcludeFilter = new GUIContent("Remove from Exclude Filter", "");
+            public static readonly GUIContent menuItemSetAsParentMarkerFilter = new GUIContent("Set as Parent Marker Filter", "");
+            public static readonly GUIContent menuItemClearParentMarkerFilter = new GUIContent("Clear Parent Marker Filter", "");
+            public static readonly GUIContent menuItemSetAsRemoveMarker = new GUIContent("Remove Marker", "");
+            public static readonly GUIContent menuItemCopyToClipboard = new GUIContent("Copy to Clipboard", "");
+
+            public static readonly GUIContent invalidEntry = new GUIContent("-");
+        }
+
+        public ComparisonTable(TreeViewState state, MultiColumnHeader multicolumnHeader, ProfileDataView left, ProfileDataView right, List<MarkerPairing> pairings, bool hideRemovedMarkers, ProfileAnalyzerWindow profileAnalyzerWindow, Draw2D draw2D, Color leftColor, Color rightColor) : base(state, multicolumnHeader)
+        {
+            m_2D = draw2D;
+            m_LeftDataView = left;
+            m_RightDataView = right;
+            m_LeftColor = leftColor;
+            m_RightColor = rightColor;
+            m_Pairings = pairings;
+            m_HideRemovedMarkers = hideRemovedMarkers;
+            m_ProfileAnalyzerWindow = profileAnalyzerWindow;
+
+            m_MaxColumns = Enum.GetValues(typeof(MyColumns)).Length;
+            Assert.AreEqual(m_SortOptions.Length, m_MaxColumns, "Ensure number of sort options are in sync with number of MyColumns enum values");
+
+            // Custom setup
+            rowHeight = kRowHeights;
+            showAlternatingRowBackgrounds = true;
+            showBorder = true;
+            customFoldoutYOffset = (kRowHeights - EditorGUIUtility.singleLineHeight) * 0.5f; // center foldout in the row since we also center content. See RowGUI
+            // extraSpaceBeforeIconAndLabel = 0;
+            multicolumnHeader.sortingChanged += OnSortingChanged;
+            multiColumnHeader.visibleColumnsChanged += OnVisibleColumnsChanged;
+
+            Reload();
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            int idForhiddenRoot = -1;
+            int depthForHiddenRoot = -1;
+            ProfileTreeViewItem root = new ProfileTreeViewItem(idForhiddenRoot, depthForHiddenRoot, "root", null);
+
+            float minDiff = float.MaxValue;
+            float maxDiff = 0.0f;
+            double totalMinDiff = float.MaxValue;
+            double totalMaxDiff = 0.0f;
+            float countMinDiff = float.MaxValue;
+            float countMaxDiff = 0.0f;
+            float countMeanMinDiff = float.MaxValue;
+            float countMeanMaxDiff = 0.0f;
+            for (int index = 0; index < m_Pairings.Count; ++index)
+            {
+                var pairing = m_Pairings[index];
+
+                if (!m_ProfileAnalyzerWindow.DoesMarkerPassFilter(pairing.name))
+                    continue;
+
+                double timeIgnored;
+                double msTotal;
+                if (m_HideRemovedMarkers && IsFullyIgnored(pairing, out timeIgnored, out msTotal))
+                    continue;
+
+                var item = new ComparisonTreeViewItem(index, 0, pairing.name, pairing);
+                root.AddChild(item);
+
+                float diff = Diff(item);
+                if (diff < minDiff)
+                    minDiff = diff;
+                if (diff > maxDiff && diff < float.MaxValue)
+                    maxDiff = diff;
+
+                double totalDiff = TotalDiff(item);
+                if (totalDiff < totalMinDiff)
+                    totalMinDiff = totalDiff;
+                if (totalDiff > totalMaxDiff && totalDiff < float.MaxValue)
+                    totalMaxDiff = totalDiff;
+
+                float countDiff = CountDiff(item);
+                if (countDiff < countMinDiff)
+                    countMinDiff = countDiff;
+                if (countDiff > countMaxDiff && countDiff < float.MaxValue)
+                    countMaxDiff = countDiff;
+
+                float countMeanDiff = CountMeanDiff(item);
+                if (countMeanDiff < countMeanMinDiff)
+                    countMeanMinDiff = countMeanDiff;
+                if (countMeanDiff > countMeanMaxDiff && countMeanDiff < float.MaxValue)
+                    countMeanMaxDiff = countMeanDiff;
+            }
+
+            m_DiffRange = Math.Max(Math.Abs(minDiff), Math.Abs(maxDiff));
+            m_TotalDiffRange = Math.Max(Math.Abs(totalMinDiff), Math.Abs(totalMaxDiff));
+            m_CountDiffRange = Math.Max(Math.Abs(countMinDiff), Math.Abs(countMaxDiff));
+            m_CountMeanDiffRange = Math.Max(Math.Abs(countMeanMinDiff), Math.Abs(countMeanMaxDiff));
+
+            return root;
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem root)
+        {
+            m_Rows.Clear();
+
+            if (rootItem != null && rootItem.children != null)
+            {
+                foreach (ComparisonTreeViewItem node in rootItem.children)
+                {
+                    m_Rows.Add(node);
+                }
+            }
+
+            SortIfNeeded(m_Rows);
+
+            return m_Rows;
+        }
+
+        void OnSortingChanged(MultiColumnHeader _multiColumnHeader)
+        {
+            SortIfNeeded(GetRows());
+        }
+
+        protected virtual void OnVisibleColumnsChanged(MultiColumnHeader multiColumnHeader)
+        {
+            m_ProfileAnalyzerWindow.SetComparisonModeColumns(multiColumnHeader.state.visibleColumns);
+            multiColumnHeader.ResizeToFit();
+        }
+
+        void SortIfNeeded(IList<TreeViewItem> rows)
+        {
+            if (rows.Count <= 1)
+            {
+                return;
+            }
+
+            if (multiColumnHeader.sortedColumnIndex == -1)
+            {
+                return; // No column to sort for (just use the order the data are in)
+            }
+
+            // Sort the roots of the existing tree items
+            SortByMultipleColumns();
+
+            // Update the data with the sorted content
+            rows.Clear();
+            foreach (var node in rootItem.children)
+            {
+                rows.Add(node);
+            }
+
+            Repaint();
+        }
+
+        void SortByMultipleColumns()
+        {
+            var sortedColumns = multiColumnHeader.state.sortedColumns;
+
+            if (sortedColumns.Length == 0)
+            {
+                return;
+            }
+
+            var myTypes = rootItem.children.Cast<ComparisonTreeViewItem>();
+            var orderedQuery = InitialOrder(myTypes, sortedColumns);
+            for (int i = 1; i < sortedColumns.Length; i++)
+            {
+                SortOption sortOption = m_SortOptions[sortedColumns[i]];
+                bool ascending = multiColumnHeader.IsSortedAscending(sortedColumns[i]);
+
+                switch (sortOption)
+                {
+                    case SortOption.Name:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.name, ascending);
+                        break;
+                    case SortOption.State:
+                        orderedQuery = orderedQuery.ThenBy(l => State(l), ascending);
+                        break;
+                    case SortOption.LeftMedian:
+                        orderedQuery = orderedQuery.ThenBy(l => LeftMedianSorting(l), ascending);
+                        break;
+                    case SortOption.RightMedian:
+                        orderedQuery = orderedQuery.ThenBy(l => RightMedianSorting(l), ascending);
+                        break;
+                    case SortOption.Diff:
+                        orderedQuery = orderedQuery.ThenBy(l => Diff(l), ascending);
+                        break;
+                    case SortOption.ReverseDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => - Diff(l), ascending);
+                        break;
+                    case SortOption.DiffPercent:
+                        orderedQuery = orderedQuery.ThenBy(l => DiffPercent(l), ascending).ThenBy(l => Diff(l), ascending);
+                        break;
+                    case SortOption.AbsDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => AbsDiff(l), ascending);
+                        break;
+                    case SortOption.LeftCount:
+                        orderedQuery = orderedQuery.ThenBy(l => LeftCount(l), ascending);
+                        break;
+                    case SortOption.RightCount:
+                        orderedQuery = orderedQuery.ThenBy(l => RightCount(l), ascending);
+                        break;
+                    case SortOption.CountDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => CountDiff(l), ascending);
+                        break;
+                    case SortOption.ReverseCountDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => - CountDiff(l), ascending);
+                        break;
+                    case SortOption.CountDiffPercent:
+                        orderedQuery = orderedQuery.ThenBy(l => CountDiffPercent(l), ascending).ThenBy(l => CountDiff(l), ascending);
+                        break;
+                    case SortOption.AbsCountDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => AbsCountDiff(l), ascending);
+                        break;
+                    case SortOption.LeftCountMean:
+                        orderedQuery = orderedQuery.ThenBy(l => LeftCountMean(l), ascending);
+                        break;
+                    case SortOption.RightCountMean:
+                        orderedQuery = orderedQuery.ThenBy(l => RightCountMean(l), ascending);
+                        break;
+                    case SortOption.CountMeanDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => CountMeanDiff(l), ascending);
+                        break;
+                    case SortOption.ReverseCountMeanDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => - CountMeanDiff(l), ascending);
+                        break;
+                    case SortOption.CountMeanDiffPercent:
+                        orderedQuery = orderedQuery.ThenBy(l => CountMeanDiffPercent(l), ascending).ThenBy(l => CountMeanDiff(l), ascending);
+                        break;
+                    case SortOption.AbsCountMeanDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => AbsCountMeanDiff(l), ascending);
+                        break;
+                    case SortOption.LeftTotal:
+                        orderedQuery = orderedQuery.ThenBy(l => LeftTotal(l), ascending);
+                        break;
+                    case SortOption.RightTotal:
+                        orderedQuery = orderedQuery.ThenBy(l => RightTotal(l), ascending);
+                        break;
+                    case SortOption.TotalDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => TotalDiff(l), ascending);
+                        break;
+                    case SortOption.ReverseTotalDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => - TotalDiff(l), ascending);
+                        break;
+                    case SortOption.TotalDiffPercent:
+                        orderedQuery = orderedQuery.ThenBy(l => TotalDiffPercent(l), ascending).ThenBy(l => TotalDiff(l), ascending);
+                        break;
+                    case SortOption.AbsTotalDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => AbsTotalDiff(l), ascending);
+                        break;
+                    case SortOption.LeftDepth:
+                        orderedQuery = orderedQuery.ThenBy(l => LeftMinDepth(l), ascending);
+                        break;
+                    case SortOption.RightDepth:
+                        orderedQuery = orderedQuery.ThenBy(l => RightMinDepth(l), ascending);
+                        break;
+                    case SortOption.DepthDiff:
+                        orderedQuery = orderedQuery.ThenBy(l => DepthDiff(l), ascending);
+                        break;
+                    case SortOption.LeftThreads:
+                        orderedQuery = orderedQuery.ThenBy(l => l.cachedRowString != null ? l.cachedRowString[(int)MyColumns.LeftThreads].text : LeftThreads(l), ascending);
+                        break;
+                    case SortOption.RightThreads:
+                        orderedQuery = orderedQuery.ThenBy(l => l.cachedRowString != null ? l.cachedRowString[(int)MyColumns.RightThreads].text : RightThreads(l), ascending);
+                        break;
+                }
+            }
+
+            rootItem.children = orderedQuery.Cast<TreeViewItem>().ToList();
+        }
+
+        MarkerData GetLeftMarker(MarkerPairing pairing)
+        {
+            if (pairing.leftIndex < 0)
+                return null;
+
+            List<MarkerData> markers = m_LeftDataView.analysis.GetMarkers();
+            if (pairing.leftIndex >= markers.Count)
+                return null;
+
+            return markers[pairing.leftIndex];
+        }
+        MarkerData GetRightMarker(MarkerPairing pairing)
+        {
+            if (pairing.rightIndex < 0)
+                return null;
+
+            List<MarkerData> markers = m_RightDataView.analysis.GetMarkers();
+            if (pairing.rightIndex >= markers.Count)
+                return null;
+
+            return markers[pairing.rightIndex];
+        }
+
+        MarkerData GetLeftMarker(ComparisonTreeViewItem item)
+        {
+            return GetLeftMarker(item.data);
+        }
+
+        MarkerData GetRightMarker(ComparisonTreeViewItem item)
+        {
+            return GetRightMarker(item.data);
+        }
+
+        string LeftFirstThread(ComparisonTreeViewItem item)
+        {
+            return m_ProfileAnalyzerWindow.GetUIThreadName(MarkerData.GetFirstThread(GetLeftMarker(item)));
+        }
+
+        string RightFirstThread(ComparisonTreeViewItem item)
+        {
+            return m_ProfileAnalyzerWindow.GetUIThreadName(MarkerData.GetFirstThread(GetRightMarker(item)));
+        }
+
+        string GetThreadNames(MarkerData marker)
+        {
+            if (marker == null)
+                return "";
+
+            var uiNames = new List<string>();
+            foreach (string threadNameWithIndex in marker.threads)
+            {
+                string uiName = m_ProfileAnalyzerWindow.GetUIThreadName(threadNameWithIndex);
+
+                uiNames.Add(uiName);
+            }
+            uiNames.Sort(m_ProfileAnalyzerWindow.CompareUINames);
+
+            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            bool first = true;
+            foreach (var uiName in uiNames)
+            {
+                if (first)
+                    first = false;
+                else
+                    sb.Append(", ");
+                sb.Append(uiName);
+            }
+
+            return sb.ToString();
+        }
+
+        string LeftThreads(ComparisonTreeViewItem item)
+        {
+            return GetThreadNames(GetLeftMarker(item));
+        }
+
+        string RightThreads(ComparisonTreeViewItem item)
+        {
+            return GetThreadNames(GetRightMarker(item));
+        }
+
+        float LeftMedianSorting(ComparisonTreeViewItem item)
+        {
+            var marker = GetLeftMarker(item);
+            if (marker == null)
+                return -1f;
+            return MarkerData.GetMsMedian(marker);
+        }
+
+        float LeftMedian(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMsMedian(GetLeftMarker(item));
+        }
+
+        int LeftMedianFrameIndex(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMedianFrameIndex(GetLeftMarker(item));
+        }
+
+        float RightMedianSorting(ComparisonTreeViewItem item)
+        {
+            var marker = GetRightMarker(item);
+            if (marker == null)
+                return -1f;
+            return MarkerData.GetMsMedian(marker);
+        }
+
+        float RightMedian(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMsMedian(GetRightMarker(item));
+        }
+
+        int RightMedianFrameIndex(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMedianFrameIndex(GetRightMarker(item));
+        }
+
+        float Diff(ComparisonTreeViewItem item)
+        {
+            return RightMedian(item) - LeftMedian(item);
+        }
+
+        float DiffPercent(float left, float right)
+        {
+            if (left == 0f)
+                return float.MaxValue;
+            if (right == 0f)
+                return float.MinValue;
+
+            float diff = right - left;
+            return (100f * diff) / left;
+        }
+
+        float DiffPercent(double left, double right)
+        {
+            if (left == 0.0)
+                return float.MaxValue;
+            if (right == 0.0)
+                return float.MinValue;
+
+            double diff = right - left;
+            return (float)((100.0 * diff) / left);
+        }
+
+        float DiffPercent(ComparisonTreeViewItem item)
+        {
+            float right = RightMedian(item);
+            float left = LeftMedian(item);
+            return DiffPercent(left, right);
+        }
+
+        float AbsDiff(ComparisonTreeViewItem item)
+        {
+            return Math.Abs(Diff(item));
+        }
+
+        float LeftCount(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetCount(GetLeftMarker(item));
+        }
+
+        float RightCount(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetCount(GetRightMarker(item));
+        }
+
+        float CountDiff(ComparisonTreeViewItem item)
+        {
+            return RightCount(item) - LeftCount(item);
+        }
+
+        float CountDiffPercent(ComparisonTreeViewItem item)
+        {
+            float right = RightCount(item);
+            float left = LeftCount(item);
+            return DiffPercent(left, right);
+        }
+
+        float AbsCountDiff(ComparisonTreeViewItem item)
+        {
+            return Math.Abs(CountDiff(item));
+        }
+
+        float LeftCountMean(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetCountMean(GetLeftMarker(item));
+        }
+
+        float RightCountMean(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetCountMean(GetRightMarker(item));
+        }
+
+        float CountMeanDiff(ComparisonTreeViewItem item)
+        {
+            return RightCountMean(item) - LeftCountMean(item);
+        }
+
+        float CountMeanDiffPercent(ComparisonTreeViewItem item)
+        {
+            float right = RightCountMean(item);
+            float left = LeftCountMean(item);
+            return DiffPercent(left, right);
+        }
+
+        float AbsCountMeanDiff(ComparisonTreeViewItem item)
+        {
+            return Math.Abs(CountMeanDiff(item));
+        }
+
+        double LeftTotal(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMsTotal(GetLeftMarker(item));
+        }
+
+        double RightTotal(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMsTotal(GetRightMarker(item));
+        }
+
+        double TotalDiff(ComparisonTreeViewItem item)
+        {
+            return RightTotal(item) - LeftTotal(item);
+        }
+
+        float TotalDiffPercent(ComparisonTreeViewItem item)
+        {
+            double right = RightTotal(item);
+            double left = LeftTotal(item);
+            return DiffPercent(left, right);
+        }
+
+        double AbsTotalDiff(ComparisonTreeViewItem item)
+        {
+            return Math.Abs(TotalDiff(item));
+        }
+
+        int LeftMinDepth(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMinDepth(GetLeftMarker(item));
+        }
+
+        int RightMinDepth(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMinDepth(GetRightMarker(item));
+        }
+
+        int LeftMaxDepth(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMaxDepth(GetLeftMarker(item));
+        }
+
+        int RightMaxDepth(ComparisonTreeViewItem item)
+        {
+            return MarkerData.GetMaxDepth(GetRightMarker(item));
+        }
+
+        int DepthDiff(ComparisonTreeViewItem item)
+        {
+            if (item.data.leftIndex < 0)
+                return int.MaxValue;
+            if (item.data.rightIndex < 0)
+                return int.MaxValue - 1;
+
+            return RightMinDepth(item) - LeftMinDepth(item);
+        }
+
+        double TimeRemoved(ComparisonTreeViewItem item)
+        {
+            double removed;
+            removed = MarkerData.GetTimeRemoved(GetLeftMarker(item));
+            if (removed > 0.0)
+                return removed;
+            removed = MarkerData.GetTimeRemoved(GetRightMarker(item));
+            if (removed > 0.0)
+                return removed;
+
+            return 0.0;
+        }
+
+        double TimeIgnored(MarkerPairing pairing)
+        {
+            double ignored;
+            ignored = MarkerData.GetTimeIgnored(GetLeftMarker(pairing));
+            if (ignored > 0.0)
+                return ignored;
+            ignored = MarkerData.GetTimeIgnored(GetRightMarker(pairing));
+            if (ignored > 0.0)
+                return ignored;
+
+            return 0.0;
+        }
+
+        double TimeIgnored(ComparisonTreeViewItem item)
+        {
+            double ignored;
+            ignored = MarkerData.GetTimeIgnored(GetLeftMarker(item));
+            if (ignored > 0.0)
+                return ignored;
+            ignored = MarkerData.GetTimeIgnored(GetRightMarker(item));
+            if (ignored > 0.0)
+                return ignored;
+
+            return 0.0;
+        }
+
+        bool IsFullyIgnored(MarkerPairing pairing, out double timeIgnored, out double msTotal)
+        {
+            MarkerData left = GetLeftMarker(pairing);
+            MarkerData right = GetRightMarker(pairing);
+
+            double leftTimeIgnored = MarkerData.GetTimeIgnored(left);
+            double rightTimeIgnored = MarkerData.GetTimeIgnored(right);
+            double leftMsTotal = MarkerData.GetMsTotal(left);
+            double rightMsTotal = MarkerData.GetMsTotal(right);
+
+            bool result = false;
+            if (leftTimeIgnored > 0.0 || rightTimeIgnored > 0.0)
+            {
+                if (leftMsTotal == 0.0 && rightMsTotal == 0.0)
+                    result = true;
+            }
+
+            if (leftTimeIgnored > 0.0)
+            {
+                timeIgnored = leftTimeIgnored;
+                msTotal = leftMsTotal;
+            }
+            else
+            {
+                timeIgnored = rightTimeIgnored;
+                msTotal = rightMsTotal;
+            }
+
+            return result;
+        }
+
+        bool IsFullyIgnored(ComparisonTreeViewItem item, out double timeIgnored, out double msTotal)
+        {
+            return IsFullyIgnored(item.data, out timeIgnored, out msTotal);
+        }
+
+        int State(ComparisonTreeViewItem item)
+        {
+            if (TimeRemoved(item) > 0.0)
+            {
+                return -3;
+            }
+            if (TimeIgnored(item) > 0.0)
+            {
+                double timeIgnored;
+                double msTotal;
+                bool removed = IsFullyIgnored(item, out timeIgnored, out msTotal);
+                if (removed)
+                    return -2;
+                else
+                    return -1;
+            }
+
+            return 0;
+        }
+
+        IOrderedEnumerable<ComparisonTreeViewItem> InitialOrder(IEnumerable<ComparisonTreeViewItem> myTypes, int[] history)
+        {
+            SortOption sortOption = m_SortOptions[history[0]];
+            bool ascending = multiColumnHeader.IsSortedAscending(history[0]);
+            switch (sortOption)
+            {
+                case SortOption.Name:
+                    return myTypes.Order(l => l.data.name, ascending);
+                case SortOption.State:
+                    return myTypes.Order(l => State(l), ascending);
+                case SortOption.LeftMedian:
+                    return myTypes.Order(l => LeftMedianSorting(l), ascending);
+                case SortOption.RightMedian:
+                    return myTypes.Order(l => RightMedianSorting(l), ascending);
+                case SortOption.Diff:
+                    return myTypes.Order(l => Diff(l), ascending);
+                case SortOption.ReverseDiff:
+                    return myTypes.Order(l => - Diff(l), ascending);
+                case SortOption.DiffPercent:
+                    return myTypes.Order(l => DiffPercent(l), ascending).ThenBy(l => Diff(l), ascending);
+                case SortOption.AbsDiff:
+                    return myTypes.Order(l => AbsDiff(l), ascending);
+                case SortOption.LeftCount:
+                    return myTypes.Order(l => LeftCount(l), ascending);
+                case SortOption.RightCount:
+                    return myTypes.Order(l => RightCount(l), ascending);
+                case SortOption.CountDiff:
+                    return myTypes.Order(l => CountDiff(l), ascending);
+                case SortOption.ReverseCountDiff:
+                    return myTypes.Order(l => - CountDiff(l), ascending);
+                case SortOption.CountDiffPercent:
+                    return myTypes.Order(l => CountDiffPercent(l), ascending).ThenBy(l => CountDiff(l), ascending);
+                case SortOption.AbsCountDiff:
+                    return myTypes.Order(l => AbsCountDiff(l), ascending);
+                case SortOption.LeftCountMean:
+                    return myTypes.Order(l => LeftCountMean(l), ascending);
+                case SortOption.RightCountMean:
+                    return myTypes.Order(l => RightCountMean(l), ascending);
+                case SortOption.CountMeanDiff:
+                    return myTypes.Order(l => CountMeanDiff(l), ascending);
+                case SortOption.ReverseCountMeanDiff:
+                    return myTypes.Order(l => - CountMeanDiff(l), ascending);
+                case SortOption.CountMeanDiffPercent:
+                    return myTypes.Order(l => CountMeanDiffPercent(l), ascending).ThenBy(l => CountMeanDiff(l), ascending);
+                case SortOption.AbsCountMeanDiff:
+                    return myTypes.Order(l => AbsCountMeanDiff(l), ascending);
+                case SortOption.LeftTotal:
+                    return myTypes.Order(l => LeftTotal(l), ascending);
+                case SortOption.RightTotal:
+                    return myTypes.Order(l => RightTotal(l), ascending);
+                case SortOption.TotalDiff:
+                    return myTypes.Order(l => TotalDiff(l), ascending);
+                case SortOption.ReverseTotalDiff:
+                    return myTypes.Order(l => - TotalDiff(l), ascending);
+                case SortOption.TotalDiffPercent:
+                    return myTypes.Order(l => TotalDiffPercent(l), ascending).ThenBy(l => TotalDiff(l), ascending);
+                case SortOption.AbsTotalDiff:
+                    return myTypes.Order(l => AbsTotalDiff(l), ascending);
+                case SortOption.LeftDepth:
+                    return myTypes.Order(l => LeftMinDepth(l), ascending);
+                case SortOption.RightDepth:
+                    return myTypes.Order(l => RightMinDepth(l), ascending);
+                case SortOption.DepthDiff:
+                    return myTypes.Order(l => DepthDiff(l), ascending);
+                case SortOption.LeftThreads:
+                    return myTypes.Order(l => l.cachedRowString != null ? l.cachedRowString[(int)MyColumns.LeftThreads].text : LeftThreads(l), ascending);
+                case SortOption.RightThreads:
+                    return myTypes.Order(l => l.cachedRowString != null ? l.cachedRowString[(int)MyColumns.RightThreads].text : RightThreads(l), ascending);
+                default:
+                    Assert.IsTrue(false, "Unhandled enum");
+                    break;
+            }
+
+            // default
+            return myTypes.Order(l => l.data.name, ascending);
+        }
+
+        public bool ShowingHorizontalScroll
+        {
+            get
+            {
+                return showingHorizontalScrollBar;
+            }
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            var item = (ComparisonTreeViewItem)args.item;
+
+            var clipRect = m_2D.GetClipRect();
+            clipRect.y = state.scrollPos.y;
+            clipRect.x = state.scrollPos.x;
+            m_2D.SetClipRect(clipRect);
+
+            if (item.cachedRowString == null)
+            {
+                GenerateStrings(item);
+            }
+
+            for (int i = 0; i < args.GetNumVisibleColumns(); ++i)
+            {
+                CellGUI(args.GetCellRect(i), item, (MyColumns)args.GetColumn(i), ref args);
+            }
+            m_2D.ClearClipRect();
+        }
+
+        static bool IsBar(MyColumns col)
+        {
+            switch (col)
+            {
+                case MyColumns.LeftBar:
+                case MyColumns.RightBar:
+                case MyColumns.LeftCountBar:
+                case MyColumns.RightCountBar:
+                case MyColumns.LeftTotalBar:
+                case MyColumns.RightTotalBar:
+                case MyColumns.LeftCountMeanBar:
+                case MyColumns.RightCountMeanBar:
+                    return true;
+            }
+
+            return false;
+        }
+
+        internal void WriteTableContentsCSV(System.IO.StreamWriter writer)
+        {
+            var visibleColumns = multiColumnHeader.state.visibleColumns.Where(c => !IsBar((MyColumns)c)).ToArray();
+            for (int i = 0, n = visibleColumns.Length; i < n; i++)
+            {
+                if (i != 0)
+                    writer.Write(',');
+                var colIdx = visibleColumns[i];
+                writer.Write(s_HeaderData[colIdx].content.text);
+            }
+            writer.WriteLine();
+
+            foreach (var child in rootItem.children)
+            {
+                var item = (ComparisonTreeViewItem)child;
+                if (item.cachedRowString == null)
+                    GenerateStrings(item);
+                for (int i = 0, n = visibleColumns.Length; i < n; i++)
+                {
+                    if (i != 0)
+                        writer.Write(';');
+                    var colIdx = visibleColumns[i];
+                    writer.Write(item.cachedRowString[colIdx].text);
+                }
+
+                writer.WriteLine();
+            }
+        }
+
+        string ToDisplayUnits(float ms, bool showUnits = false, bool showFullValueWhenBelowZero = false)
+        {
+            return m_ProfileAnalyzerWindow.ToDisplayUnits(ms, showUnits, 0, showFullValueWhenBelowZero);
+        }
+
+        string ToDisplayUnits(double ms, bool showUnits = false, bool showFullValueWhenBelowZero = false)
+        {
+            return m_ProfileAnalyzerWindow.ToDisplayUnits(ms, showUnits, 0, showFullValueWhenBelowZero);
+        }
+
+        string ToTooltipDisplayUnits(float ms, bool showUnits = false, int onFrame = -1)
+        {
+            return m_ProfileAnalyzerWindow.ToTooltipDisplayUnits(ms, showUnits, onFrame);
+        }
+
+        string ToTooltipDisplayUnits(double ms, bool showUnits = false, int onFrame = -1)
+        {
+            return ToTooltipDisplayUnits((float)ms, showUnits, onFrame);
+        }
+
+        GUIContent ToDisplayUnitsWithTooltips(float ms, bool showUnits = false, int onFrame = -1)
+        {
+            return m_ProfileAnalyzerWindow.ToDisplayUnitsWithTooltips(ms, showUnits, onFrame);
+        }
+
+        GUIContent ToDisplayUnitsWithTooltips(double ms, bool showUnits = false, int onFrame = -1)
+        {
+            return ToDisplayUnitsWithTooltips((float)ms, showUnits, onFrame);
+        }
+
+        void CopyToClipboard(Event current, string text)
+        {
+            EditorGUIUtility.systemCopyBuffer = text;
+        }
+
+        GenericMenu GenerateActiveContextMenu(string markerName, Event evt, GUIContent content)
+        {
+            GenericMenu menu = new GenericMenu();
+            menu.AddItem(Styles.menuItemSelectFramesInAll, false, () => m_ProfileAnalyzerWindow.SelectFramesContainingMarker(markerName, false));
+            menu.AddItem(Styles.menuItemSelectFramesInCurrent, false, () => m_ProfileAnalyzerWindow.SelectFramesContainingMarker(markerName, true));
+            if (m_ProfileAnalyzerWindow.AllSelected())
+                menu.AddDisabledItem(Styles.menuItemSelectFramesAll);
+            else
+                menu.AddItem(Styles.menuItemSelectFramesAll, false, () => m_ProfileAnalyzerWindow.SelectAllFrames());
+
+            menu.AddSeparator("");
+            if (!m_ProfileAnalyzerWindow.GetNameFilters().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddItem(Styles.menuItemAddToIncludeFilter, false, () => m_ProfileAnalyzerWindow.AddToIncludeFilter(markerName));
+            else
+                menu.AddItem(Styles.menuItemRemoveFromIncludeFilter, false, () => m_ProfileAnalyzerWindow.RemoveFromIncludeFilter(markerName));
+            if (!m_ProfileAnalyzerWindow.GetNameExcludes().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddItem(Styles.menuItemAddToExcludeFilter, false, () => m_ProfileAnalyzerWindow.AddToExcludeFilter(markerName));
+            else
+                menu.AddItem(Styles.menuItemRemoveFromExcludeFilter, false, () => m_ProfileAnalyzerWindow.RemoveFromExcludeFilter(markerName));
+
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemSetAsParentMarkerFilter, false, () => m_ProfileAnalyzerWindow.SetAsParentMarkerFilter(markerName));
+            menu.AddItem(Styles.menuItemClearParentMarkerFilter, false, () => m_ProfileAnalyzerWindow.SetAsParentMarkerFilter(""));
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemSetAsRemoveMarker, false, () => m_ProfileAnalyzerWindow.SetAsRemoveMarker(markerName));
+            menu.AddSeparator("");
+            if (markerName != null && !string.IsNullOrEmpty(markerName))
+                menu.AddItem(Styles.menuItemCopyToClipboard, false, () => CopyToClipboard(evt, markerName));
+
+            return menu;
+        }
+
+        GenericMenu GenerateDisabledContextMenu(string markerName, GUIContent content)
+        {
+            GenericMenu menu = new GenericMenu();
+            menu.AddDisabledItem(Styles.menuItemSelectFramesInAll);
+            menu.AddDisabledItem(Styles.menuItemSelectFramesInCurrent);
+            menu.AddDisabledItem(Styles.menuItemSelectFramesAll);
+
+            menu.AddSeparator("");
+            if (!m_ProfileAnalyzerWindow.GetNameFilters().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddDisabledItem(Styles.menuItemAddToIncludeFilter);
+            else
+                menu.AddDisabledItem(Styles.menuItemRemoveFromIncludeFilter);
+            if (!m_ProfileAnalyzerWindow.GetNameExcludes().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddDisabledItem(Styles.menuItemAddToExcludeFilter);
+            else
+                menu.AddDisabledItem(Styles.menuItemRemoveFromExcludeFilter);
+
+            menu.AddSeparator("");
+            menu.AddDisabledItem(Styles.menuItemSetAsParentMarkerFilter);
+            menu.AddDisabledItem(Styles.menuItemClearParentMarkerFilter);
+            menu.AddSeparator("");
+            menu.AddDisabledItem(Styles.menuItemSetAsRemoveMarker);
+            menu.AddSeparator("");
+            if (content != null && !string.IsNullOrEmpty(content.text))
+                menu.AddDisabledItem(Styles.menuItemCopyToClipboard);
+            return menu;
+        }
+
+        void ShowContextMenu(Rect cellRect, string markerName, GUIContent content)
+        {
+            Event current = Event.current;
+            if (cellRect.Contains(current.mousePosition) && current.type == EventType.ContextClick)
+            {
+                GenericMenu menu;
+                if (!m_ProfileAnalyzerWindow.IsAnalysisRunning())
+                    menu = GenerateActiveContextMenu(markerName, current, content);
+                else
+                    menu = GenerateDisabledContextMenu(markerName, content);
+
+                menu.ShowAsContext();
+
+                current.Use();
+            }
+        }
+
+        void ShowText(Rect rect, string text)
+        {
+            EditorGUI.LabelField(rect, text);
+            //EditorGUI.TextArea(rect, text);
+        }
+
+        void ShowText(Rect rect, GUIContent content)
+        {
+            EditorGUI.LabelField(rect, content);
+            //ShowText(rect, content.text);
+        }
+
+        string PercentString(float percent)
+        {
+            if (percent == float.MinValue)
+                return "-";
+            if (percent == float.MaxValue)
+                return "-";
+
+            return string.Format(CultureInfo.InvariantCulture, "{0:+0.##;-0.##;0}%", percent);
+        }
+
+        string DiffPercentString(ComparisonTreeViewItem item)
+        {
+            return PercentString(DiffPercent(item));
+        }
+
+        string CountDiffPercentString(ComparisonTreeViewItem item)
+        {
+            return PercentString(CountDiffPercent(item));
+        }
+
+        string CountMeanDiffPercentString(ComparisonTreeViewItem item)
+        {
+            return PercentString(CountMeanDiffPercent(item));
+        }
+
+        string TotalDiffPercentString(ComparisonTreeViewItem item)
+        {
+            return PercentString(TotalDiffPercent(item));
+        }
+
+        void GenerateStrings(ComparisonTreeViewItem item)
+        {
+            item.cachedRowString = new GUIContent[m_MaxColumns];
+
+            int leftMedianFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(LeftMedianFrameIndex(item), m_LeftDataView);
+            int rightMedianFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(RightMedianFrameIndex(item), m_RightDataView);
+
+            if (TimeRemoved(item) > 0.0)
+            {
+                item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name + " [Modified]", item.data.name + "\n\nTime reduced by removing child marker time");
+                item.cachedRowString[(int)MyColumns.State] = new GUIContent("Modified", "Time reduced by removing child marker time");
+            }
+            else if (TimeIgnored(item) > 0.0)
+            {
+                double timeIgnored;
+                double msTotal;
+                bool removed = IsFullyIgnored(item, out timeIgnored, out msTotal);
+
+                if (removed)
+                {
+                    item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name + " [Removed]", item.data.name + "\n\nAll marker time removed");
+                    item.cachedRowString[(int)MyColumns.State] = new GUIContent("Removed", "All marker time removed");
+                }
+                else
+                {
+                    item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name + " [Partial Removal]", item.data.name + "\n\nSome marker time removed (some instances)");
+                    item.cachedRowString[(int)MyColumns.State] = new GUIContent("Partial Removal", "Some marker time removed (some instances)");
+                }
+            }
+            else
+            { 
+                item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name, item.data.name);
+                item.cachedRowString[(int)MyColumns.State] = new GUIContent("", "");
+            }
+            item.cachedRowString[(int)MyColumns.LeftMedian] = item.data.leftIndex < 0 ? Styles.invalidEntry : ToDisplayUnitsWithTooltips(LeftMedian(item), false, leftMedianFrameIndex);
+            item.cachedRowString[(int)MyColumns.RightMedian] = item.data.rightIndex < 0 ? Styles.invalidEntry : ToDisplayUnitsWithTooltips(RightMedian(item), false, rightMedianFrameIndex);
+            string tooltip = ToTooltipDisplayUnits(Diff(item), true);
+            item.cachedRowString[(int)MyColumns.LeftBar] = Diff(item) < 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.RightBar] = Diff(item) > 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.Diff] = ToDisplayUnitsWithTooltips(Diff(item));
+            item.cachedRowString[(int)MyColumns.DiffPercent] = new GUIContent(DiffPercentString(item), "");
+            item.cachedRowString[(int)MyColumns.AbsDiff] = ToDisplayUnitsWithTooltips(AbsDiff(item));
+
+            item.cachedRowString[(int)MyColumns.LeftCount] = item.data.leftIndex < 0 ? Styles.invalidEntry : new GUIContent(string.Format("{0}", LeftCount(item)));
+            item.cachedRowString[(int)MyColumns.RightCount] = item.data.rightIndex < 0 ? Styles.invalidEntry : new GUIContent(string.Format("{0}", RightCount(item)));
+            tooltip = string.Format("{0}", CountDiff(item));
+            item.cachedRowString[(int)MyColumns.LeftCountBar] = CountDiff(item) < 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.RightCountBar] = CountDiff(item) > 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.CountDiff] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(string.Format("{0}", CountDiff(item)), CountDiffPercentString(item));
+            item.cachedRowString[(int)MyColumns.CountDiffPercent] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(CountDiffPercentString(item), "");
+            item.cachedRowString[(int)MyColumns.AbsCountDiff] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(string.Format("{0}", AbsCountDiff(item)));
+
+            item.cachedRowString[(int)MyColumns.LeftCountMean] = item.data.leftIndex < 0 ? Styles.invalidEntry : new GUIContent(string.Format(CultureInfo.InvariantCulture, "{0:f0}", LeftCountMean(item)));
+            item.cachedRowString[(int)MyColumns.RightCountMean] = item.data.rightIndex < 0 ? Styles.invalidEntry : new GUIContent(string.Format(CultureInfo.InvariantCulture, "{0:f0}", RightCountMean(item)));
+            tooltip = string.Format("{0}", CountMeanDiff(item));
+            item.cachedRowString[(int)MyColumns.LeftCountMeanBar] = CountMeanDiff(item) < 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.RightCountMeanBar] = CountMeanDiff(item) > 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.CountMeanDiff] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(string.Format("{0:f0}", CountMeanDiff(item)), CountMeanDiffPercentString(item));
+            item.cachedRowString[(int)MyColumns.CountMeanDiffPercent] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(CountMeanDiffPercentString(item), "");
+            item.cachedRowString[(int)MyColumns.AbsCountMeanDiff] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(string.Format("{0:f0}", AbsCountMeanDiff(item)));
+
+            item.cachedRowString[(int)MyColumns.LeftTotal] = item.data.leftIndex < 0 ? Styles.invalidEntry : ToDisplayUnitsWithTooltips(LeftTotal(item));
+            item.cachedRowString[(int)MyColumns.RightTotal] = item.data.rightIndex < 0 ? Styles.invalidEntry : ToDisplayUnitsWithTooltips(RightTotal(item));
+            tooltip = ToTooltipDisplayUnits(TotalDiff(item), true);
+            item.cachedRowString[(int)MyColumns.LeftTotalBar] = TotalDiff(item) < 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.RightTotalBar] = TotalDiff(item) > 0 ? new GUIContent("", tooltip) : new GUIContent("", "");
+            item.cachedRowString[(int)MyColumns.TotalDiff] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : ToDisplayUnitsWithTooltips(TotalDiff(item));
+            item.cachedRowString[(int)MyColumns.TotalDiffPercent] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(TotalDiffPercentString(item), "");
+            item.cachedRowString[(int)MyColumns.AbsTotalDiff] = (item.data.leftIndex < 0 && item.data.rightIndex < 0) ? Styles.invalidEntry : ToDisplayUnitsWithTooltips(AbsTotalDiff(item));
+
+            item.cachedRowString[(int)MyColumns.LeftDepth] = item.data.leftIndex < 0 ? Styles.invalidEntry : (LeftMinDepth(item) == LeftMaxDepth(item)) ? new GUIContent(string.Format("{0}", LeftMinDepth(item)), "") : new GUIContent(string.Format("{0}-{1}", LeftMinDepth(item), LeftMaxDepth(item)), "");
+            item.cachedRowString[(int)MyColumns.RightDepth] = item.data.rightIndex < 0 ? Styles.invalidEntry : (RightMinDepth(item) == RightMaxDepth(item)) ? new GUIContent(string.Format("{0}", RightMinDepth(item)), "") : new GUIContent(string.Format("{0}-{1}", RightMinDepth(item), RightMaxDepth(item)), "");
+            item.cachedRowString[(int)MyColumns.DepthDiff] = (item.data.leftIndex < 0 || item.data.rightIndex < 0) ? Styles.invalidEntry : new GUIContent(string.Format("{0}", DepthDiff(item)));
+
+            item.cachedRowString[(int)MyColumns.LeftThreads] = item.data.leftIndex < 0 ? Styles.invalidEntry : new GUIContent(string.Format("{0}", LeftThreads(item)), LeftThreads(item));
+            item.cachedRowString[(int)MyColumns.RightThreads] = item.data.rightIndex < 0 ? Styles.invalidEntry : new GUIContent(string.Format("{0}", RightThreads(item)), RightThreads(item));
+        }
+
+        void ShowBar(Rect rect, float ms, float range, GUIContent content, Color color, bool rightAlign)
+        {
+            if (ms > 0.0f)
+            {
+                if (m_2D.DrawStart(rect))
+                {
+                    float w = Math.Max(1.0f, rect.width * ms / range);
+                    float x = rightAlign ? rect.width - w : 0.0f;
+                    m_2D.DrawFilledBox(x, 1, w, rect.height - 1, color);
+                    m_2D.DrawEnd();
+                }
+            }
+            GUI.Label(rect, content);
+        }
+
+        void CellGUI(Rect cellRect, ComparisonTreeViewItem item, MyColumns column, ref RowGUIArgs args)
+        {
+            // Center cell rect vertically (makes it easier to place controls, icons etc in the cells)
+            CenterRectUsingSingleLineHeight(ref cellRect);
+
+            GUIContent content = item.cachedRowString[(int)column];
+            switch (column)
+            {
+                case MyColumns.Name:
+                {
+                    args.rowRect = cellRect;
+                    //base.RowGUI(args);
+                    ShowText(cellRect, content);
+                }
+                break;
+                case MyColumns.State:
+                case MyColumns.LeftMedian:
+                case MyColumns.Diff:
+                case MyColumns.RightMedian:
+                case MyColumns.DiffPercent:
+                case MyColumns.AbsDiff:
+                case MyColumns.LeftCount:
+                case MyColumns.RightCount:
+                case MyColumns.CountDiff:
+                case MyColumns.CountDiffPercent:
+                case MyColumns.AbsCountDiff:
+                case MyColumns.LeftCountMean:
+                case MyColumns.RightCountMean:
+                case MyColumns.CountMeanDiff:
+                case MyColumns.CountMeanDiffPercent:
+                case MyColumns.AbsCountMeanDiff:
+                case MyColumns.LeftTotal:
+                case MyColumns.RightTotal:
+                case MyColumns.TotalDiff:
+                case MyColumns.TotalDiffPercent:
+                case MyColumns.AbsTotalDiff:
+                case MyColumns.LeftDepth:
+                case MyColumns.RightDepth:
+                case MyColumns.LeftThreads:
+                case MyColumns.RightThreads:
+                case MyColumns.DepthDiff:
+                    ShowText(cellRect, content);
+                    break;
+                case MyColumns.LeftBar:
+                    ShowBar(cellRect, -Diff(item), m_DiffRange, content, m_LeftColor, true);
+                    break;
+                case MyColumns.RightBar:
+                    ShowBar(cellRect, Diff(item), m_DiffRange, content, m_RightColor, false);
+                    break;
+                case MyColumns.LeftCountBar:
+                    ShowBar(cellRect, -CountDiff(item), m_CountDiffRange, content, m_LeftColor, true);
+                    break;
+                case MyColumns.RightCountBar:
+                    ShowBar(cellRect, CountDiff(item), m_CountDiffRange, content, m_RightColor, false);
+                    break;
+                case MyColumns.LeftCountMeanBar:
+                    ShowBar(cellRect, -CountMeanDiff(item), m_CountMeanDiffRange, content, m_LeftColor, true);
+                    break;
+                case MyColumns.RightCountMeanBar:
+                    ShowBar(cellRect, CountMeanDiff(item), m_CountMeanDiffRange, content, m_RightColor, false);
+                    break;
+                case MyColumns.LeftTotalBar:
+                    ShowBar(cellRect, (float)-TotalDiff(item), (float)m_TotalDiffRange, content, m_LeftColor, true);
+                    break;
+                case MyColumns.RightTotalBar:
+                    ShowBar(cellRect, (float)TotalDiff(item), (float)m_TotalDiffRange, content, m_RightColor, false);
+                    break;
+            }
+
+            ShowContextMenu(cellRect, item.data.name, content);
+        }
+
+        // Misc
+        //--------
+
+        protected override bool CanMultiSelect(TreeViewItem item)
+        {
+            return false;
+        }
+
+        struct HeaderData
+        {
+            public readonly GUIContent content;
+            public readonly float width;
+            public readonly float minWidth;
+            public readonly bool autoResize;
+            public readonly bool allowToggleVisibility;
+            public readonly bool ascending;
+
+            public HeaderData(string name, string tooltip = "", float width = 50, float minWidth = 30, bool autoResize = true, bool allowToggleVisibility = true, bool ascending = false)
+            {
+                content = new GUIContent(name, tooltip);
+                this.width = width;
+                this.minWidth = minWidth;
+                this.autoResize = autoResize;
+                this.allowToggleVisibility = allowToggleVisibility;
+                this.ascending = ascending;
+            }
+        }
+
+        static HeaderData[] s_HeaderData = new HeaderData[]
+            {
+                new HeaderData("Marker Name", "Marker Name\n\nFrame marker time is total of all instances in frame", width: 300, minWidth: 100, autoResize: false, allowToggleVisibility: false, ascending: true),
+                new HeaderData("State", "Status of marker entry (if modified or removed from frame time due to 'Remove' filter)"),
+
+                new HeaderData("Left Median", "Left median time\n\nCentral marker time over all selected frames"),
+                new HeaderData("<", "Difference if left data set is a larger value", width: 50),
+                new HeaderData(">", "Difference if right data set is a larger value", width: 50),
+                new HeaderData("Right Median", "Right median time\n\nCentral marker time over all selected frames"),
+                new HeaderData("Diff", "Difference between left and right times"),
+                new HeaderData("Diff Percent", "Difference between left and right times as percentage of left marker time"),
+                new HeaderData("Abs Diff", "Absolute difference between left and right times"),
+
+                new HeaderData("Count Left", "Left marker count over all selected frames\n\nMultiple can occur per frame"),
+                new HeaderData("< Count", "Count Difference if left data set count is a larger value", width: 50),
+                new HeaderData("> Count", "Count Difference if right data set count is a larger value", width: 50),
+                new HeaderData("Count Right", "Right marker count over all selected frames\n\nMultiple can occur per frame"),
+                new HeaderData("Count Delta", "Difference in marker count"),
+                new HeaderData("Count Delta Percent", "Difference in marker count as percentage of left marker count"),
+                new HeaderData("Abs Count", "Absolute difference in marker count"),
+
+                new HeaderData("Count Left Frame", "Average number of markers per frame in left data set\n\ntotal count / number of non zero frames"),
+                new HeaderData("< Frame Count", "Per frame Count Difference if left data set count is a larger value", width: 50),
+                new HeaderData("> Frame Count", "Per frame Count Difference if right data set count is a larger value", width: 50),
+                new HeaderData("Count Right Frame", "Average number of markers per frame in right data set\n\ntotal count / number of non zero frames"),
+                new HeaderData("Count Delta Frame", "Difference in per frame marker count"),
+                new HeaderData("Count Delta Percent Frame", "Difference in per frame marker count as percentage of left count"),
+                new HeaderData("Abs Frame Count", "Absolute difference in per frame marker count"),
+
+                new HeaderData("Total Left", "Left marker total time over all selected frames"),
+                new HeaderData("< Total", "Total Difference if left data set total is a larger value", width: 50),
+                new HeaderData("> Total", "Total Difference if right data set total is a larger value", width: 50),
+                new HeaderData("Total Right", "Right marker total time over all selected frames"),
+                new HeaderData("Total Delta", "Difference in total time over all selected frames"),
+                new HeaderData("Total Delta Percent", "Difference in total time over all selected frames as percentage of left marker total time"),
+                new HeaderData("Abs Total", "Absolute difference in total time over all selected frames"),
+
+                new HeaderData("Depth Left", "Marker depth in marker hierarchy\n\nMay appear at multiple levels"),
+                new HeaderData("Depth Right", "Marker depth in marker hierarchy\n\nMay appear at multiple levels"),
+                new HeaderData("Depth Diff", "Absolute difference in min marker depth total over all selected frames"),
+
+                new HeaderData("Threads Left", "Threads the marker occurs on in left data set (with filtering applied)"),
+                new HeaderData("Threads Right", "Threads the marker occurs on in right data set (with filtering applied)"),
+            };
+        public static MultiColumnHeaderState CreateDefaultMultiColumnHeaderState(MarkerColumnFilter modeFilter)
+        {
+            var columnList = new List<MultiColumnHeaderState.Column>();
+            foreach (var header in s_HeaderData)
+            {
+                columnList.Add(new MultiColumnHeaderState.Column
+                {
+                    headerContent = header.content,
+                    headerTextAlignment = TextAlignment.Left,
+                    sortedAscending = header.ascending,
+                    sortingArrowAlignment = TextAlignment.Left,
+                    width = header.width,
+                    minWidth = header.minWidth,
+                    autoResize = header.autoResize,
+                    allowToggleVisibility = header.allowToggleVisibility
+                });
+            }
+            ;
+            var columns = columnList.ToArray();
+
+            m_MaxColumns = Enum.GetValues(typeof(MyColumns)).Length;
+            Assert.AreEqual(columns.Length, m_MaxColumns, "Number of columns should match number of enum values: You probably forgot to update one of them.");
+
+            var state = new MultiColumnHeaderState(columns);
+            SetMode(modeFilter, state);
+            return state;
+        }
+
+        protected override void SelectionChanged(IList<int> selectedIds)
+        {
+            base.SelectionChanged(selectedIds);
+
+            if (selectedIds.Count > 0)
+                m_ProfileAnalyzerWindow.SelectPairing(selectedIds[0]);
+        }
+
+        static int[] GetDefaultVisibleColumns(MarkerColumnFilter.Mode mode)
+        {
+            int[] visibleColumns;
+
+            switch (mode)
+            {
+                default:
+                case MarkerColumnFilter.Mode.Custom:
+                case MarkerColumnFilter.Mode.TimeAndCount:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftMedian,
+                        (int)MyColumns.LeftBar,
+                        (int)MyColumns.RightBar,
+                        (int)MyColumns.RightMedian,
+                        (int)MyColumns.Diff,
+                        (int)MyColumns.AbsDiff,
+                        (int)MyColumns.LeftCount,
+                        (int)MyColumns.RightCount,
+                        (int)MyColumns.CountDiff,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Time:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftMedian,
+                        (int)MyColumns.LeftBar,
+                        (int)MyColumns.RightBar,
+                        (int)MyColumns.RightMedian,
+                        (int)MyColumns.Diff,
+                        (int)MyColumns.AbsDiff,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Totals:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftTotal,
+                        (int)MyColumns.LeftTotalBar,
+                        (int)MyColumns.RightTotalBar,
+                        (int)MyColumns.RightTotal,
+                        (int)MyColumns.TotalDiff,
+                        (int)MyColumns.AbsTotalDiff,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.TimeWithTotals:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftMedian,
+                        (int)MyColumns.LeftBar,
+                        (int)MyColumns.RightBar,
+                        (int)MyColumns.RightMedian,
+                        (int)MyColumns.AbsDiff,
+                        (int)MyColumns.LeftTotal,
+                        (int)MyColumns.LeftTotalBar,
+                        (int)MyColumns.RightTotalBar,
+                        (int)MyColumns.RightTotal,
+                        (int)MyColumns.AbsTotalDiff,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.CountTotals:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftCount,
+                        (int)MyColumns.LeftCountBar,
+                        (int)MyColumns.RightCountBar,
+                        (int)MyColumns.RightCount,
+                        (int)MyColumns.CountDiff,
+                        (int)MyColumns.AbsCountDiff,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.CountPerFrame:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftCountMean,
+                        (int)MyColumns.LeftCountMeanBar,
+                        (int)MyColumns.RightCountMeanBar,
+                        (int)MyColumns.RightCountMean,
+                        (int)MyColumns.CountMeanDiff,
+                        (int)MyColumns.AbsCountMeanDiff,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Depth:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftDepth,
+                        (int)MyColumns.RightDepth,
+                        (int)MyColumns.DepthDiff,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Threads:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.LeftThreads,
+                        (int)MyColumns.RightThreads,
+                    };
+                    break;
+            }
+
+            return visibleColumns;
+        }
+
+        static void SetMode(MarkerColumnFilter modeFilter, MultiColumnHeaderState state)
+        {
+            switch (modeFilter.mode)
+            {
+                case MarkerColumnFilter.Mode.Custom:
+                    if (modeFilter.visibleColumns == null)
+                        state.visibleColumns = GetDefaultVisibleColumns(modeFilter.mode);
+                    else
+                        state.visibleColumns = modeFilter.visibleColumns;
+                    break;
+                default:
+                    state.visibleColumns = GetDefaultVisibleColumns(modeFilter.mode);
+                    break;
+            }
+
+            if (modeFilter.visibleColumns == null)
+                modeFilter.visibleColumns = state.visibleColumns;
+        }
+
+        public void SetMode(MarkerColumnFilter modeFilter)
+        {
+            SetMode(modeFilter, multiColumnHeader.state);
+            multiColumnHeader.ResizeToFit();
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ComparisonTable.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ComparisonTable.cs.meta
new file mode 100644
index 0000000..45094eb
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ComparisonTable.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 281fa44557d2f417aafc937bd5d93ba5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceDropdown.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceDropdown.cs
new file mode 100644
index 0000000..ae44d98
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceDropdown.cs
@@ -0,0 +1,128 @@
+using System;
+using UnityEngine;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEditor.IMGUI.Controls;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    class DepthSliceDropdown : AdvancedDropdown
+    {
+        class DepthSliceDropdownItem : AdvancedDropdownItem
+        {
+            public int depthSlice;
+            public int depthSliceLeft;
+            public int depthSliceRight;
+            public DepthSliceDropdownItem(int depthSlice)
+                : base(DepthSliceUI.DepthFilterToString(depthSlice))
+            {
+                this.depthSlice = depthSlice;
+                depthSliceLeft = depthSlice;
+                depthSliceRight = depthSlice;
+            }
+            public DepthSliceDropdownItem(int depthSliceLeft, int depthSliceRight, bool leftIsMain)
+                : base(DepthSliceUI.DepthFilterToString(depthSliceLeft, depthSliceRight, leftIsMain))
+            {
+                depthSlice = Math.Max(depthSliceLeft, depthSliceRight);
+                this.depthSliceLeft = depthSliceLeft;
+                this.depthSliceRight = depthSliceRight;
+            }
+        }
+
+        Action<int, int, int> m_Callback = null;
+        int m_DepthSliceCount;
+        int m_DepthSliceCountRight;
+        int m_CurrentDepthSliceA;
+        int m_CurrentDepthSliceB;
+        int m_DepthDiff;
+
+        static FieldInfo m_DataSourceFieldInfo;
+        static Type m_DataSourceTypeInfo;
+        static PropertyInfo m_SelectedIdsFieldInfo;
+
+        public DepthSliceDropdown(int depthSliceCount, int currentDepthSliceA, int currentDepthSliceB, Action<int, int, int> callback, int depthDiff, int depthSliceCountRight = ProfileAnalyzer.kDepthAll) : base(new AdvancedDropdownState())
+        {
+            m_DepthSliceCount = depthSliceCount;
+            m_DepthSliceCountRight = depthSliceCountRight;
+            m_CurrentDepthSliceA = currentDepthSliceA;
+            m_CurrentDepthSliceB = currentDepthSliceB;
+            m_Callback = callback;
+            m_DepthDiff = depthDiff;
+            if (m_DataSourceFieldInfo == null || m_DataSourceFieldInfo == null || m_SelectedIdsFieldInfo == null)
+            {
+                Assembly assem = typeof(AdvancedDropdown).Assembly;
+                var advancedDropdownTypeInfo = typeof(AdvancedDropdown);
+                m_DataSourceTypeInfo = assem.GetType("UnityEditor.IMGUI.Controls.CallbackDataSource");
+                m_DataSourceFieldInfo = advancedDropdownTypeInfo.GetField("m_DataSource", BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedIdsFieldInfo = m_DataSourceTypeInfo.GetProperty("selectedIDs", BindingFlags.Public | BindingFlags.Instance);
+            }
+        }
+
+        protected override AdvancedDropdownItem BuildRoot()
+        {
+            var root = new AdvancedDropdownItem("Depth Slice");
+            var allItem = new DepthSliceDropdownItem(ProfileAnalyzer.kDepthAll);
+            root.AddChild(allItem);
+            if (m_CurrentDepthSliceA == ProfileAnalyzer.kDepthAll && m_CurrentDepthSliceB == ProfileAnalyzer.kDepthAll)
+                (m_SelectedIdsFieldInfo.GetValue(m_DataSourceFieldInfo.GetValue(this)) as List<int>).Add(allItem.id);
+            var count = m_DepthSliceCountRight == ProfileAnalyzer.kDepthAll ? m_DepthSliceCount :
+                Math.Max(m_DepthSliceCount + Math.Max(0, m_DepthDiff), m_DepthSliceCountRight - Math.Min(0, m_DepthDiff));
+
+            var leftIsMain = m_DepthDiff < 0;
+            var mainThreshold = leftIsMain ? m_DepthSliceCount : m_DepthSliceCountRight;
+            var secondaryMinThreshold = Math.Abs(m_DepthDiff);
+            var secondaryMaxThreshold = (leftIsMain ? m_DepthSliceCountRight : m_DepthSliceCount) + secondaryMinThreshold;
+
+            var startIndex = 1;
+            for (int i = startIndex; i <= count; i++)
+            {
+                var selected = false;
+                AdvancedDropdownItem child;
+                if (m_DepthSliceCountRight != ProfileAnalyzer.kDepthAll)
+                {
+                    var left = Mathf.Clamp(i - Math.Max(0, m_DepthDiff), 1, m_DepthSliceCount);
+                    var right = Mathf.Clamp(i - Math.Max(0, -m_DepthDiff), 1, m_DepthSliceCountRight);
+
+                    if (m_DepthSliceCount <= 0)
+                        left = -1;
+                    else if (m_DepthSliceCountRight <= 0)
+                        right = -1;
+                    else
+                    {
+                        // Separators only make sense if there is data on both sides
+
+                        // did we pass the threshold of the main's max depth and started clamping it down?
+                        if (i == mainThreshold + 1
+                        // ... or the threshold of the secondary's negative depth when adjusted for the depth diff, and stoped clamping it up?
+                            || (secondaryMinThreshold != 0 && i == secondaryMinThreshold + 1)
+                        // ... or the threshold of the secondary's max depth when adjusted for the depth diff, and started clamping it down?
+                            || (i == secondaryMaxThreshold + 1))
+                            root.AddSeparator();
+                    }
+
+                    child = new DepthSliceDropdownItem(left, right, leftIsMain);
+                    selected = m_CurrentDepthSliceA == left && m_CurrentDepthSliceB == right;
+                }
+                else
+                {
+                    child = new DepthSliceDropdownItem(i);
+                    selected = m_CurrentDepthSliceA == i;
+                }
+                root.AddChild(child);
+                if (selected)
+                    (m_SelectedIdsFieldInfo.GetValue(m_DataSourceFieldInfo.GetValue(this)) as List<int>).Add(child.id);
+            }
+            return root;
+        }
+
+        protected override void ItemSelected(AdvancedDropdownItem item)
+        {
+            base.ItemSelected(item);
+            if (m_Callback != null)
+            {
+                var sliceItem = (item as DepthSliceDropdownItem);
+                m_Callback(sliceItem.depthSlice, sliceItem.depthSliceLeft, sliceItem.depthSliceRight);
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceDropdown.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceDropdown.cs.meta
new file mode 100644
index 0000000..923fa2c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceDropdown.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 71b9e5c19de243c386bd048443d1c5cc
+timeCreated: 1608205585
\ No newline at end of file
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceUI.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceUI.cs
new file mode 100644
index 0000000..e51bb77
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceUI.cs
@@ -0,0 +1,460 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Video;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    public class DepthSliceUI
+    {
+        [SerializeField] int m_DepthFilter = ProfileAnalyzer.kDepthAll;
+        public int depthFilter {get { return m_DepthFilter; }}
+
+        [SerializeField] int m_DepthFilter1 = ProfileAnalyzer.kDepthAll;
+        public int depthFilter1 {get { return m_DepthFilter1; }}
+
+        [SerializeField] int m_DepthFilter2 = ProfileAnalyzer.kDepthAll;
+        public int depthFilter2 {get { return m_DepthFilter2; }}
+
+        [SerializeField] bool m_DepthFilterAuto = true;
+
+        [SerializeField] int m_MostCommonDepthDiff = 0;
+
+        int mostCommonDepthDiff
+        {
+            set
+            {
+                if (m_MostCommonDepthDiff != value)
+                {
+                    m_MostCommonDepthDiff = value;
+                    UpdateAutoDepthTitleText();
+                }
+            }
+            get
+            {
+                return m_MostCommonDepthDiff;
+            }
+        }
+
+        void UpdateAutoDepthTitleText()
+        {
+            ProfileAnalyzerWindow.Styles.autoDepthTitle.text =
+                string.Format(ProfileAnalyzerWindow.Styles.autoDepthTitleText, mostCommonDepthDiff);
+        }
+
+        Action<bool> m_UpdateActiveTabCallback = null;
+        public DepthSliceUI(Action<bool> updateActiveTabCallback)
+        {
+            m_UpdateActiveTabCallback = updateActiveTabCallback;
+            UpdateAutoDepthTitleText();
+        }
+
+        public void OnEnable(Action<bool> updateActiveTabCallback)
+        {
+            m_UpdateActiveTabCallback = updateActiveTabCallback;
+            UpdateAutoDepthTitleText();
+        }
+
+        enum ViewType
+        {
+            Single,
+            Left,
+            Right,
+            Locked,
+        }
+        void DrawDepthFilterDropdown(GUIContent title, bool enabled, ProfileDataView view, Action<int, int, int> callback,
+            ViewType viewType, ProfileDataView profileSingleView, ProfileDataView profileLeftView, ProfileDataView profileRightView)
+        {
+            if(title !=null)
+                EditorGUILayout.LabelField(title, GUILayout.Width(ProfileAnalyzerWindow.LayoutSize.FilterOptionsEnumWidth));
+
+            int depthFilter = ProfileAnalyzer.kDepthAll;
+            int depthFilterOther = ProfileAnalyzer.kDepthAll;
+            var maxDepth = view.GetMaxDepth();
+            var maxDepthLeft = ProfileAnalyzer.kDepthAll;
+            var maxDepthRight = ProfileAnalyzer.kDepthAll;
+
+            var oldDepthFilter = ProfileAnalyzer.kDepthAll;
+            var oldDepthFilterOtherLocked = ProfileAnalyzer.kDepthAll;
+            var depthDiff = mostCommonDepthDiff;
+            GUIContent content;
+            switch (viewType)
+            {
+                case ViewType.Single:
+                    oldDepthFilter = m_DepthFilter;
+                    depthFilter = m_DepthFilter =
+                        m_DepthFilter == ProfileAnalyzer.kDepthAll ?
+                        ProfileAnalyzer.kDepthAll :
+                        profileSingleView.ClampToValidDepthValue(m_DepthFilter);
+                    content = new GUIContent(DepthFilterToString(depthFilter));
+                    depthFilterOther = depthFilter;
+                    depthDiff = 0;
+                    break;
+                case ViewType.Left:
+                    oldDepthFilter = m_DepthFilter1;
+                    depthFilter = m_DepthFilter1 =
+                        m_DepthFilter1 == ProfileAnalyzer.kDepthAll ?
+                        ProfileAnalyzer.kDepthAll :
+                        profileLeftView.ClampToValidDepthValue(m_DepthFilter1);
+                    content = new GUIContent(DepthFilterToString(depthFilter));
+                    depthFilterOther = depthFilter;
+                    break;
+                case ViewType.Right:
+                    oldDepthFilter = m_DepthFilter2;
+                    depthFilter = m_DepthFilter2 = m_DepthFilter2 == ProfileAnalyzer.kDepthAll
+                        ? ProfileAnalyzer.kDepthAll
+                        : profileRightView.ClampToValidDepthValue(m_DepthFilter2);
+                    content = new GUIContent(DepthFilterToString(depthFilter));
+                    depthFilterOther = depthFilter;
+                    break;
+                case ViewType.Locked:
+                    oldDepthFilter = m_DepthFilter1;
+                    oldDepthFilterOtherLocked = m_DepthFilter2;
+                    maxDepth = maxDepthLeft = profileLeftView.GetMaxDepth();
+                    maxDepthRight = profileRightView.GetMaxDepth();
+
+                    ClampDepthFilterForAutoRespectingDiff(ref m_DepthFilter1, ref m_DepthFilter2, profileLeftView, profileRightView);
+
+                    depthFilter = m_DepthFilter1;
+                    depthFilterOther = m_DepthFilter2;
+                    content = new GUIContent(DepthFilterToString(m_DepthFilter1, m_DepthFilter2, mostCommonDepthDiff < 0));
+                    break;
+                default:
+                    throw new NotImplementedException();
+            }
+
+            var lastEnabled = GUI.enabled;
+            GUI.enabled = enabled;
+            var rect = GUILayoutUtility.GetRect(content, EditorStyles.popup, GUILayout.MinWidth(ProfileAnalyzerWindow.LayoutSize.FilterOptionsEnumWidth));
+            if (GUI.Button(rect, content, EditorStyles.popup))
+            {
+                var dropdown = new DepthSliceDropdown(maxDepth, depthFilter, depthFilterOther, (slice, left, right) =>
+                {
+                    if (slice != depthFilter || (viewType == ViewType.Locked && (left != m_DepthFilter1 || right != m_DepthFilter2)))
+                    {
+                        callback(slice, left, right);
+                        UpdateDepthFilters(viewType == ViewType.Single, profileSingleView, profileLeftView, profileRightView);
+                        m_UpdateActiveTabCallback(true);
+                    }
+                }, depthDiff, maxDepthRight);
+                dropdown.Show(rect);
+                EditorGUIUtility.ExitGUI();
+            }
+            else
+            {
+                // The depths can change because the data changed, not just because the user selected a different option in the dropdown
+                // in that case, the depth filters need to perform a refresh
+                if(oldDepthFilter != depthFilter || viewType == ViewType.Locked && oldDepthFilterOtherLocked != depthFilterOther)
+                {
+                    UpdateDepthFilters(viewType == ViewType.Single, profileSingleView, profileLeftView, profileRightView);
+                    m_UpdateActiveTabCallback(true);
+                }
+            }
+            GUI.enabled = lastEnabled;
+        }
+
+        int CalcSliceMenuEntryIndex(int filterDepthLeft, int filterDepthRight, int leftMax, int rightMax)
+        {
+            return mostCommonDepthDiff > 0 ?
+                filterDepthRight + Math.Max(0, filterDepthLeft - rightMax + (rightMax > 0 ? mostCommonDepthDiff : filterDepthLeft > 0 ? 1 : 0)) :
+                filterDepthLeft + Math.Max(0, filterDepthRight - leftMax - (leftMax > 0 ? mostCommonDepthDiff : filterDepthRight > 0 ? -1 :0));
+        }
+
+        void CalcAutoSlicesFromMenuEntryIndex(int depthSlcieMenuEntryIndex, ref int filterDepthLeft, ref int filterDepthRight, int leftMax, int rightMax)
+        {
+            if (mostCommonDepthDiff > 0)
+            {
+                filterDepthRight = Mathf.Clamp(depthSlcieMenuEntryIndex, 1, rightMax);
+                filterDepthLeft = Mathf.Clamp(depthSlcieMenuEntryIndex - (rightMax > 0 ? mostCommonDepthDiff : 0), 1, leftMax);
+            }
+            else
+            {
+                filterDepthLeft = Mathf.Clamp(depthSlcieMenuEntryIndex, 1, leftMax);
+                filterDepthRight = Mathf.Clamp(depthSlcieMenuEntryIndex + (leftMax > 0 ? mostCommonDepthDiff : 0), 1, rightMax);
+            }
+            // if a side has no depth, only allow All
+            if (leftMax <= 0)
+                filterDepthLeft = -1;
+            if (rightMax <= 0)
+                filterDepthRight = -1;
+        }
+
+        void ClampDepthFilterForAutoRespectingDiff(ref int filterDepthLeft, ref int filterDepthRight, ProfileDataView profileLeftView, ProfileDataView profileRightView)
+        {
+            if (filterDepthLeft == ProfileAnalyzer.kDepthAll && filterDepthRight == ProfileAnalyzer.kDepthAll)
+            {
+                // nothing to do here, keep showing all
+                return;
+            }
+
+            var leftMax = profileLeftView.GetMaxDepth();
+            var rightMax = profileRightView.GetMaxDepth();
+
+            var sliceMenuEntryIndex = CalcSliceMenuEntryIndex(filterDepthLeft, filterDepthRight, leftMax, rightMax);
+            CalcAutoSlicesFromMenuEntryIndex(sliceMenuEntryIndex, ref filterDepthLeft, ref filterDepthRight, leftMax, rightMax);
+        }
+
+        internal void DrawDepthFilter(bool isAnalysisRunning, bool singleView,
+            ProfileDataView profileSingleView, ProfileDataView profileLeftView, ProfileDataView profileRightView)
+        {
+            bool lastEnabled = GUI.enabled;
+            bool enabled = !isAnalysisRunning;
+
+            EditorGUILayout.BeginHorizontal();
+            if (singleView)
+            {
+                EditorGUILayout.LabelField(ProfileAnalyzerWindow.Styles.depthTitle, GUILayout.Width(ProfileAnalyzerWindow.LayoutSize.FilterOptionsLeftLabelWidth));
+                DrawDepthFilterDropdown(null, enabled,
+                    profileSingleView, (primary, left, right) => m_DepthFilter = primary,
+                    ViewType.Single, profileSingleView, profileLeftView, profileRightView);
+            }
+            else
+            {
+                EditorGUILayout.LabelField(ProfileAnalyzerWindow.Styles.depthTitle, GUILayout.Width(ProfileAnalyzerWindow.LayoutSize.FilterOptionsLeftLabelWidth));
+
+                if (m_DepthFilterAuto)
+                {
+                    DrawDepthFilterDropdown(null, enabled, profileLeftView, (primary, left, right) =>
+                        {
+                            m_DepthFilter1 = left;
+                            m_DepthFilter2 = right;
+                            ClampDepthFilterForAutoRespectingDiff(ref m_DepthFilter1, ref m_DepthFilter2, profileLeftView, profileRightView);
+                        },
+                        ViewType.Locked, profileSingleView, profileLeftView, profileRightView);
+                }
+                else
+                {
+
+                    DrawDepthFilterDropdown(ProfileAnalyzerWindow.Styles.leftDepthTitle, enabled, profileLeftView,
+                        (primary, left, right) => m_DepthFilter1 = primary,
+                        ViewType.Left, profileSingleView, profileLeftView, profileRightView);
+
+                    DrawDepthFilterDropdown(ProfileAnalyzerWindow.Styles.rightDepthTitle, enabled && !m_DepthFilterAuto, profileRightView,
+                        (primary, left, right) => m_DepthFilter2 = primary,
+                        ViewType.Right, profileSingleView, profileLeftView, profileRightView);
+                }
+                bool lastDepthFilterLock = m_DepthFilterAuto;
+                GUI.enabled = enabled;
+                m_DepthFilterAuto = EditorGUILayout.ToggleLeft(ProfileAnalyzerWindow.Styles.autoDepthTitle, m_DepthFilterAuto);
+                GUI.enabled = lastEnabled;
+                if (m_DepthFilterAuto != lastDepthFilterLock)
+                {
+                    if (UpdateDepthFilters(singleView, profileSingleView, profileLeftView, profileRightView))
+                        m_UpdateActiveTabCallback(true);
+                }
+            }
+            GUILayout.FlexibleSpace();
+            EditorGUILayout.EndHorizontal();
+        }
+
+        internal bool UpdateDepthFilters(bool singleView, ProfileDataView profileSingleView, ProfileDataView profileLeftView, ProfileDataView profileRightView)
+        {
+            bool changed = false;
+
+            if (!singleView)
+            {
+                // First respect the auto flag
+                if (UpdateAutoDepthFilter(profileLeftView, profileRightView))
+                    changed = true;
+
+                // Make sure Single matches the updated comparison view
+                if (profileLeftView.path == profileSingleView.path)
+                {
+                    // Use same filter on single view if its the same file
+                    if (m_DepthFilter != m_DepthFilter1)
+                    {
+                        m_DepthFilter = m_DepthFilter1;
+                        changed = true;
+                    }
+                }
+                if (profileRightView.path == profileSingleView.path)
+                {
+                    // Use same filter on single view if its the same file
+                    if (m_DepthFilter != m_DepthFilter2)
+                    {
+                        m_DepthFilter = m_DepthFilter2;
+                        changed = true;
+                    }
+                }
+            }
+            else
+            {
+                // Make sure comparisons match updated single view
+                if (profileLeftView.path == profileSingleView.path)
+                {
+                    // Use same filter on comparison left view if its the same file
+                    if (m_DepthFilter1 != m_DepthFilter)
+                    {
+                        m_DepthFilter1 = m_DepthFilter;
+                        changed = true;
+                    }
+                    if (m_DepthFilterAuto)
+                    {
+                        var newDepthFilter2 = m_DepthFilter;
+                        ClampDepthFilterForAutoRespectingDiff(ref m_DepthFilter1, ref newDepthFilter2,  profileLeftView, profileRightView);
+
+                        if (m_DepthFilter2 != newDepthFilter2)
+                        {
+                            m_DepthFilter2 = newDepthFilter2;
+                            changed = true;
+                        }
+
+                        if (UpdateAutoDepthFilter(profileLeftView, profileRightView))
+                            changed = true;
+                    }
+
+                    if (UpdateAutoDepthFilter(profileLeftView, profileRightView))
+                        changed = true;
+                }
+
+                if (profileRightView.path == profileSingleView.path)
+                {
+                    // Use same filter on comparison right view if its the same file
+                    if (m_DepthFilter2 != m_DepthFilter)
+                    {
+                        m_DepthFilter2 = m_DepthFilter;
+                        changed = true;
+                    }
+                    if (m_DepthFilterAuto)
+                    {
+                        var newDepthFilter1 = m_DepthFilter;
+                        ClampDepthFilterForAutoRespectingDiff(ref newDepthFilter1, ref m_DepthFilter2, profileLeftView, profileRightView);
+                        if (m_DepthFilter1 != newDepthFilter1)
+                        {
+                            m_DepthFilter1 = newDepthFilter1;
+                            changed = true;
+                        }
+
+                        if (UpdateAutoDepthFilter(profileLeftView, profileRightView))
+                            changed = true;
+                    }
+                }
+            }
+
+            return changed;
+        }
+
+        int CalculateDepthDifference(ProfileAnalysis leftAnalysis, ProfileAnalysis rightAnalysis, List<MarkerPairing> pairings)
+        {
+            if (pairings.Count <= 0)
+            {
+                mostCommonDepthDiff = 0;
+                return 0;
+            }
+
+            var leftMarkers = leftAnalysis.GetMarkers();
+            var rightMarkers = rightAnalysis.GetMarkers();
+
+            int totalCount = 0;
+            Dictionary<int, int> depthDifferences = new Dictionary<int, int>();
+            foreach (var pairing in pairings)
+            {
+                if (pairing.leftIndex >= 0 && pairing.rightIndex >= 0)
+                {
+                    MarkerData leftMarker = leftMarkers[pairing.leftIndex];
+                    MarkerData rightMarker = rightMarkers[pairing.rightIndex];
+                    int markerDepthDiff = rightMarker.minDepth - leftMarker.minDepth;
+
+                    int value = 0;
+                    depthDifferences.TryGetValue(markerDepthDiff, out value);
+                    depthDifferences[markerDepthDiff] = value + 1;
+                    totalCount += 1;
+                }
+            }
+
+            var newDepthDiff = 0;
+
+            // Find most common depth difference
+            int maxCount = 0;
+            foreach (var diff in depthDifferences.Keys)
+            {
+                if (depthDifferences[diff] > maxCount)
+                {
+                    maxCount = depthDifferences[diff];
+                    newDepthDiff = diff;
+                }
+            }
+
+            return mostCommonDepthDiff = newDepthDiff;
+        }
+
+        bool UpdateAutoDepthFilter(ProfileDataView profileLeftView, ProfileDataView profileRightView)
+        {
+            if (m_DepthFilterAuto)
+            {
+                var newDepthFilter1 = m_DepthFilter1;
+                var newDepthFilter2 = m_DepthFilter2;
+                ClampDepthFilterForAutoRespectingDiff(ref newDepthFilter1, ref newDepthFilter2, profileLeftView, profileRightView);
+                if (m_DepthFilter1 != newDepthFilter1)
+                {
+                    m_DepthFilter1 = newDepthFilter1;
+                    return true;
+                }
+
+                if (m_DepthFilter2 != newDepthFilter2)
+                {
+                    m_DepthFilter2 = newDepthFilter2;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        internal bool UpdateDepthForCompareSync(ProfileAnalysis leftAnalysis, ProfileAnalysis rightAnalysis, List<MarkerPairing> pairings, ProfileDataView profileLeftView, ProfileDataView profileRightView)
+        {
+            int originalDepthDiff = mostCommonDepthDiff;
+            int newDepthDiff = CalculateDepthDifference(leftAnalysis, rightAnalysis, pairings);
+            if (newDepthDiff != originalDepthDiff)
+            {
+                UpdateAutoDepthFilter(profileLeftView, profileRightView);
+                return true;
+            }
+            return false;
+        }
+
+        internal GUIContent GetUIInfo(bool compare)
+        {
+            GUIContent info;
+            if (compare && m_DepthFilter1 == ProfileAnalyzer.kDepthAll && m_DepthFilter2 == ProfileAnalyzer.kDepthAll ||
+                !compare && depthFilter == ProfileAnalyzer.kDepthAll)
+            {
+                info = new GUIContent("(All depths)", string.Format("{0}\n\nSet depth 1 to get an overview of the frame", ProfileAnalyzerWindow.Styles.medianFrameTooltip));
+            }
+            else
+            {
+                if (compare && depthFilter1 != depthFilter2)
+                {
+                    if (m_DepthFilter1 == ProfileAnalyzer.kDepthAll)
+                        info = new GUIContent(string.Format("(Filtered to 'all' depths in the first data set, and depth '{0}' in the second)", m_DepthFilter2), ProfileAnalyzerWindow.Styles.medianFrameTooltip);
+                    else if (m_DepthFilter2 == ProfileAnalyzer.kDepthAll)
+                        info = new GUIContent(string.Format("(Filtered to depth '{0}' in the first data set, and 'all' depths in the second)", m_DepthFilter1), ProfileAnalyzerWindow.Styles.medianFrameTooltip);
+                    else
+                        info = new GUIContent(string.Format("(Filtered to depth '{0}' in the first data set, and depth '{1}' in the second)", m_DepthFilter1, depthFilter2), ProfileAnalyzerWindow.Styles.medianFrameTooltip);
+                }
+                else
+                    info = new GUIContent(string.Format("(Filtered to depth '{0}' only)", compare ? m_DepthFilter1 : depthFilter), ProfileAnalyzerWindow.Styles.medianFrameTooltip);
+            }
+            return info;
+        }
+
+
+        public static string DepthFilterToString(int depthFilter)
+        {
+            return depthFilter == ProfileAnalyzer.kDepthAll ? "All" : depthFilter.ToString();
+        }
+
+        public static string DepthFilterToString(int depthSliceLeft, int depthSliceRight, bool leftIsMain)
+        {
+            if(depthSliceLeft != depthSliceRight)
+            {
+                if (leftIsMain)
+                    return string.Format("{0} ({1}{2})", DepthFilterToString(depthSliceLeft), ProfileAnalyzerWindow.Styles.rightDepthTitle.text, DepthFilterToString(depthSliceRight));
+                else
+                    return string.Format("{0} ({1}{2})", DepthFilterToString(depthSliceRight), ProfileAnalyzerWindow.Styles.leftDepthTitle.text, DepthFilterToString(depthSliceLeft));
+            }
+            return DepthFilterToString(depthSliceLeft);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceUI.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceUI.cs.meta
new file mode 100644
index 0000000..3e82a3a
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/DepthSliceUI.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6d4bf3d974bf4f74a15e72b2e0a8ffa2
+timeCreated: 1608212438
\ No newline at end of file
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Draw2D.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Draw2D.cs
new file mode 100644
index 0000000..bdf3d39
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Draw2D.cs
@@ -0,0 +1,210 @@
+using UnityEngine;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class Draw2D
+    {
+        public enum Origin
+        {
+            TopLeft,
+            BottomLeft
+        };
+
+        Origin m_Origin = Origin.TopLeft;
+        GUIStyle m_GLStyle;
+        string m_ShaderName;
+        Material m_Material;
+        Rect m_Rect;
+        Vector4 m_ClipRect;
+        bool m_ClipRectEnabled = false;
+
+        public Draw2D(string shaderName)
+        {
+            m_ShaderName = shaderName;
+            CheckAndSetupMaterial();
+        }
+
+        public bool CheckAndSetupMaterial()
+        {
+            if (m_Material == null)
+            {
+                var shader = Shader.Find(m_ShaderName);
+				if (shader == null)
+				{
+					Debug.LogFormat("Unable to locate shader {0}", m_ShaderName);
+					return false;
+				}
+				
+				m_Material = new Material(shader);
+				if (m_Material == null)
+				{
+					Debug.LogFormat("Unable to create material for {0}", m_ShaderName);
+					return false;
+				}
+            }
+
+            return true;
+        }
+
+        public bool IsMaterialValid()
+        {
+            if (m_Material == null)
+                return false;
+
+            return true;
+        }
+
+        public void OnGUI()
+        {
+            if (m_GLStyle == null)
+            {
+                m_GLStyle = new GUIStyle(GUI.skin.box);
+                m_GLStyle.padding = new RectOffset(0, 0, 0, 0);
+                m_GLStyle.margin = new RectOffset(0, 0, 0, 0);
+            }
+        }
+
+        public void SetClipRect(Rect clipRect)
+        {
+            m_ClipRect = new Vector4(clipRect.x, clipRect.y, clipRect.x + clipRect.width, clipRect.y + clipRect.height);
+            m_ClipRectEnabled = true;
+
+            if (CheckAndSetupMaterial())
+			{
+				m_Material.SetFloat("_UseClipRect", m_ClipRectEnabled ? 1f : 0f);
+				m_Material.SetVector("_ClipRect", m_ClipRect);
+			}
+        }
+
+        public void ClearClipRect()
+        {
+            m_ClipRectEnabled = false;
+
+            if (CheckAndSetupMaterial())
+			{
+				m_Material.SetFloat("_UseClipRect", m_ClipRectEnabled ? 1f : 0f);
+				m_Material.SetVector("_ClipRect", m_ClipRect);
+			}
+        }
+
+        public Rect GetClipRect()
+        {
+            return new Rect(m_ClipRect.x, m_ClipRect.y, m_ClipRect.z - m_ClipRect.x, m_ClipRect.w - m_ClipRect.y);
+        }
+
+        public bool DrawStart(Rect r, Origin origin = Origin.TopLeft)
+        {
+            if (Event.current.type != EventType.Repaint)
+                return false;
+
+            if (!CheckAndSetupMaterial())
+                return false;
+
+            m_Material.SetPass(0);
+
+            m_Rect = r;
+            m_Origin = origin;
+            return true;
+        }
+
+        public bool DrawStart(float w, float h, Origin origin = Origin.TopLeft, GUIStyle style = null)
+        {
+            Rect r = GUILayoutUtility.GetRect(w, h, style == null ? m_GLStyle : style, GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(false));
+            return DrawStart(r, origin);
+        }
+
+        public void DrawEnd()
+        {
+        }
+
+        public void Translate(ref float x, ref float y)
+        {
+            // Translation done CPU side so we have world space coords in the shader for clipping.
+            if (m_Origin == Origin.BottomLeft)
+            {
+                x = m_Rect.xMin + x;
+                y = m_Rect.yMax - y;
+            }
+            else
+            {
+                x = m_Rect.xMin + x;
+                y = m_Rect.yMin + y;
+            }
+        }
+
+        public void DrawFilledBox(float x, float y, float w, float h, Color col)
+        {
+            float x2 = x + w;
+            float y2 = y + h;
+
+            Translate(ref x, ref y);
+            Translate(ref x2, ref y2);
+
+            if (m_Origin == Origin.BottomLeft)
+            {
+                GL.Begin(GL.TRIANGLE_STRIP);
+                GL.Color(col);
+                GL.Vertex3(x, y, 0);
+                GL.Vertex3(x, y2, 0);
+                GL.Vertex3(x2, y, 0);
+                GL.Vertex3(x2, y2, 0);
+                GL.End();
+            }
+            else
+            {
+                GL.Begin(GL.TRIANGLE_STRIP);
+                GL.Color(col);
+                GL.Vertex3(x, y, 0);
+                GL.Vertex3(x2, y, 0);
+                GL.Vertex3(x, y2, 0);
+                GL.Vertex3(x2, y2, 0);
+                GL.End();
+            }
+        }
+
+        public void DrawFilledBox(float x, float y, float w, float h, float r, float g, float b)
+        {
+            DrawFilledBox(x, y, w, h, new Color(r, g, b));
+        }
+
+        public void DrawLine(float x, float y, float x2, float y2, Color col)
+        {
+            Translate(ref x, ref y);
+            Translate(ref x2, ref y2);
+
+            GL.Begin(GL.LINES);
+            GL.Color(col);
+            GL.Vertex3(x, y, 0);
+            GL.Vertex3(x2, y2, 0);
+            GL.End();
+        }
+
+        public void DrawLine(float x, float y, float x2, float y2, float r, float g, float b)
+        {
+            DrawLine(x, y, x2, y2, new Color(r, g, b));
+        }
+
+        public void DrawBox(float x, float y, float w, float h, Color col)
+        {
+            float x2 = x + w;
+            float y2 = y + h;
+
+            Translate(ref x, ref y);
+            Translate(ref x2, ref y2);
+
+            GL.Begin(GL.LINE_STRIP);
+            GL.Color(col);
+            GL.Vertex3(x, y, 0);
+            GL.Vertex3(x2, y, 0);
+            GL.Vertex3(x2, y2, 0);
+            GL.Vertex3(x, y2, 0);
+            GL.Vertex3(x, y, 0);
+            GL.End();
+        }
+
+        public void DrawBox(float x, float y, float w, float h, float r, float g, float b)
+        {
+            DrawBox(x, y, w, h, new Color(r, g, b));
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Draw2D.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Draw2D.cs.meta
new file mode 100644
index 0000000..738a066
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Draw2D.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c27a543a692ef4bf19459f25898a0ba9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameSummary.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameSummary.cs
new file mode 100644
index 0000000..da6614e
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameSummary.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class FrameSummary
+    {
+        public double msTotal;
+        public int first;
+        public int last;
+        public int count;                     // Valid frame count may not be last-first
+
+        public float msMean;
+        public float msMedian;
+        public float msLowerQuartile;
+        public float msUpperQuartile;
+        public float msMin;
+        public float msMax;
+
+        public int medianFrameIndex;
+        public int minFrameIndex;
+        public int maxFrameIndex;
+
+        public int maxMarkerDepth;
+        public int totalMarkers;
+        public int markerCountMax;            // Largest marker count (over all frames)
+        public float markerCountMaxMean;      // Largest marker count mean
+
+        public int[] buckets = new int[20];   // Each bucket contains 'number of frames' for frametime in that range
+        public List<FrameTime> frames = new List<FrameTime>();
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameSummary.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameSummary.cs.meta
new file mode 100644
index 0000000..a72e16f
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameSummary.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af62f7ba5c15e47ceb426c7745e31835
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTime.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTime.cs
new file mode 100644
index 0000000..463c8d2
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTime.cs
@@ -0,0 +1,112 @@
+using System;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    /// <summary>
+    /// Metrics related to an individual frame
+    /// </summary>
+    internal struct FrameTime : IComparable<FrameTime>
+    {
+        /// <summary>Duration in the frame in milliseconds</summary>
+        public float ms;
+        /// <summary>Index of which frame this time duration occured on. A zero based frame index</summary>
+        public int frameIndex;
+        /// <summary>Number of occurrences</summary>
+        public int count;
+
+        /// <summary>Initialise FrameTime</summary>
+        /// <param name="index"> The frame index</param>
+        /// <param name="msTime"> The duration of the frame in milliseconds</param>
+        /// <param name="_count"> The number of occurrences</param>
+        public FrameTime(int index, float msTime, int _count)
+        {
+            frameIndex = index;
+            ms = msTime;
+            count = _count;
+        }
+
+        /// <summary>Initialise from another FrameTime</summary>
+        /// <param name="t"> The FrameTime to assign</param>
+        public FrameTime(FrameTime t)
+        {
+            frameIndex = t.frameIndex;
+            ms = t.ms;
+            count = t.count;
+        }
+
+        /// <summary>Compare the time duration between the frames. Used for sorting in ascending order</summary>
+        /// <param name="other"> The other FrameTime to compare </param>
+        /// <returns>-1 if this is smaller, 0 if the same, 1 if this is larger</returns>
+        public int CompareTo(FrameTime other)
+        {
+            if (ms == other.ms)
+            {
+                // secondary sort by frame index order
+                return frameIndex.CompareTo(other.frameIndex);
+            }
+
+            return ms.CompareTo(other.ms);
+        }
+
+        /// <summary>Compare the time duration between two FrameTimes. Used for sorting in ascending order</summary>
+        /// <param name="a"> The first FrameTime to compare </param>
+        /// <param name="b"> The second FrameTime to compare </param>
+        /// <returns>-1 if a is smaller, 0 if the same, 1 if a is larger</returns>
+        public static int CompareMs(FrameTime a, FrameTime b)
+        {
+            if (a.ms == b.ms)
+            {
+                // secondary sort by frame index order
+                return a.frameIndex.CompareTo(b.frameIndex);
+            }
+
+            return a.ms.CompareTo(b.ms);
+        }
+
+        /// <summary>Compare the instance count between two FrameTimes. Used for sorting in ascending order</summary>
+        /// <param name="a"> The first FrameTime to compare </param>
+        /// <param name="b"> The second FrameTime to compare </param>
+        /// <returns>-1 if a is smaller, 0 if the same, 1 if a is larger</returns>
+        public static int CompareCount(FrameTime a, FrameTime b)
+        {
+            if (a.count == b.count)
+            {
+                // secondary sort by frame index order
+                return a.frameIndex.CompareTo(b.frameIndex);
+            }
+
+            return a.count.CompareTo(b.count);
+        }
+
+        /// <summary>Compare the time duration between two FrameTimes. Used for sorting in descending order</summary>
+        /// <param name="a"> The first FrameTime to compare </param>
+        /// <param name="b"> The second FrameTime to compare </param>
+        /// <returns>-1 if a is larger, 0 if the same, 1 if a is smaller</returns>
+        public static int CompareMsDescending(FrameTime a, FrameTime b)
+        {
+            if (a.ms == b.ms)
+            {
+                // secondary sort by frame index order
+                return a.frameIndex.CompareTo(b.frameIndex);
+            }
+
+            return -a.ms.CompareTo(b.ms);
+        }
+
+        /// <summary>Compare the instance count between two FrameTimes. Used for sorting in descending order</summary>
+        /// <param name="a"> The first FrameTime to compare </param>
+        /// <param name="b"> The second FrameTime to compare </param>
+        /// <returns>-1 if a is larger, 0 if the same, 1 if a is smaller</returns>
+        public static int CompareCountDescending(FrameTime a, FrameTime b)
+        {
+            if (a.count == b.count)
+            {
+                // secondary sort by frame index order
+                return a.frameIndex.CompareTo(b.frameIndex);
+            }
+
+            return -a.count.CompareTo(b.count);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTime.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTime.cs.meta
new file mode 100644
index 0000000..538aa12
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTime.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 11b7852f3babc4a938ba8e18940df7c5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTimeGraph.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTimeGraph.cs
new file mode 100644
index 0000000..4a66b61
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTimeGraph.cs
@@ -0,0 +1,2310 @@
+using UnityEngine;
+using System;
+using System.Collections.Generic;
+using UnityEngine.Profiling;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class FrameTimeGraphGlobalSettings
+    {
+        public bool showThreads = false;
+        public bool showSelectedMarker = true;
+        public bool showFrameLines = true;
+        public bool showFrameLineText = true;
+        public bool showOrderedByFrameDuration = false;
+    }
+
+    internal class FrameTimeGraph
+    {
+        static FrameTimeGraphGlobalSettings m_GlobalSettings = new FrameTimeGraphGlobalSettings();
+
+        static public void SetGlobalSettings(FrameTimeGraphGlobalSettings globalSettings)
+        {
+            m_GlobalSettings = globalSettings;
+        }
+
+        public struct Data
+        {
+            public readonly float ms;
+            public readonly int frameOffset;
+
+            public Data(float _ms, int _index)
+            {
+                ms = _ms;
+                frameOffset = _index;
+            }
+        };
+
+        public delegate void SetRange(List<int> selected, int clickCount, FrameTimeGraph.State inputStatus);
+        public delegate void SetActive(bool active);
+
+        public enum State
+        {
+            None,
+            Dragging,
+            DragComplete
+        };
+
+        enum DragDirection
+        {
+            Start,
+            Forward,
+            Backward,
+            None
+        };
+
+        enum AxisMode
+        {
+            One60HzFrame,
+            Two60HzFrames,
+            Four60HzFrames,
+            Max,
+            Custom
+        };
+
+        Draw2D m_2D;
+        int m_DragBeginFirstOffset;
+        int m_DragBeginLastOffset;
+
+        bool m_Dragging;
+        int m_DragFirstOffset;
+        int m_DragLastOffset;
+        bool m_Moving;
+        int m_MoveHandleOffset;
+        bool m_SingleControlAction;
+
+        int m_ClickCount;
+        double m_LastClickTime;
+        bool m_MouseReleased;
+
+        bool m_Zoomed;
+        int m_ZoomStartOffset;
+        int m_ZoomEndOffset;
+
+        Color m_ColorBarBackground;
+        Color m_ColorBarBackgroundSelected;
+        Color m_ColorBar;
+        Color m_ColorBarOutOfRange;
+        Color m_ColorBarSelected;
+        Color m_ColorBarThreads;
+        Color m_ColorBarThreadsOutOfRange;
+        Color m_ColorBarThreadsSelected;
+        Color m_ColorBarMarker;
+        Color m_ColorBarMarkerOutOfRange;
+        Color m_ColorBarMarkerSelected;
+        Color m_ColorGridLine;
+
+        FrameTimeGraph m_PairedWithFrameTimeGraph;
+
+        internal static class Styles
+        {
+            public static readonly GUIContent menuItemClearSelection = new GUIContent("Clear Selection");
+            public static readonly GUIContent menuItemSelectAll = new GUIContent("Select All");
+            public static readonly GUIContent menuItemInvertSelection = new GUIContent("Invert Selection");
+            public static readonly GUIContent menuItemZoomSelection = new GUIContent("Zoom Selection");
+            public static readonly GUIContent menuItemZoomAll = new GUIContent("Zoom All");
+            public static readonly GUIContent menuItemSelectMin = new GUIContent("Select Shortest Frame");
+            public static readonly GUIContent menuItemSelectMax = new GUIContent("Select Longest Frame");
+            public static readonly GUIContent menuItemSelectMedian = new GUIContent("Select Median Frame");
+
+            public static readonly GUIContent menuItemSelectPrevious = new GUIContent("Move selection left _LEFT");
+            public static readonly GUIContent menuItemSelectNext = new GUIContent("Move selection right _RIGHT");
+
+            public static readonly GUIContent menuItemSelectGrow = new GUIContent("Grow selection  _=");
+            public static readonly GUIContent menuItemSelectShrink = new GUIContent("Shrink selection  _-");
+            public static readonly GUIContent menuItemSelectGrowLeft = new GUIContent("Grow selection left  _<");
+            public static readonly GUIContent menuItemSelectGrowRight = new GUIContent("Grow selection right  _>");
+            public static readonly GUIContent menuItemSelectShrinkLeft = new GUIContent("Shrink selection left  _&<");
+            public static readonly GUIContent menuItemSelectShrinkRight = new GUIContent("Shrink selection right  _&>");
+
+            public static readonly GUIContent menuItemSelectGrowFast = new GUIContent("Grow selection (fast)  _#=");
+            public static readonly GUIContent menuItemSelectShrinkFast = new GUIContent("Shrink selection (fast)  _#-");
+            public static readonly GUIContent menuItemSelectGrowLeftFast = new GUIContent("Grow selection left (fast)  _#<");
+            public static readonly GUIContent menuItemSelectGrowRightFast = new GUIContent("Grow selection right (fast) _#>");
+            public static readonly GUIContent menuItemSelectShrinkLeftFast = new GUIContent("Shrink selection left (fast) _#&<");
+            public static readonly GUIContent menuItemSelectShrinkRightFast = new GUIContent("Shrink selection right (fast) _#&>");
+
+            public static readonly GUIContent menuItemShowSelectedMarker = new GUIContent("Show Selected Marker");
+            public static readonly GUIContent menuItemShowThreads = new GUIContent("Show Filtered Threads");
+            //    public static readonly GUIContent menuItemDetailedMode = new GUIContent("Detailed mode");
+            public static readonly GUIContent menuItemShowFrameLines = new GUIContent("Show Frame Lines");
+            public static readonly GUIContent menuItemShowFrameLineText = new GUIContent("Show Frame Line Text");
+            public static readonly GUIContent menuItemShowOrderedByFrameDuration = new GUIContent("Order by Frame Duration");
+        }
+
+        const int kXAxisWidth = 80;
+        const int kYAxisDetailThreshold = 40;
+        const int kOverrunHeight = 3;
+
+        static AxisMode s_YAxisMode;
+        static float m_YAxisMs;
+
+        bool m_IsOrderedByFrameDuration;
+
+        List<Data> m_Values = new List<Data> {};
+        List<int> m_LastSelectedFrameOffsets = new List<int> {};
+        int[] m_FrameOffsetToDataOffsetMapping = new int[] {};
+        SetRange m_SetRange;
+        SetActive m_SetActive;
+
+        List<int> m_CurrentSelection = new List<int>();
+        int m_CurrentSelectionFirstDataOffset;
+        int m_CurrentSelectionLastDataOffset;
+
+        int m_GraphId;
+        int m_ControlID;
+        static int s_LastSelectedGraphId = -1;
+        static int s_CurrentSelectedGraphId = -1;
+
+        bool m_Enabled;
+
+        struct BarData
+        {
+            public float x;
+            public float y;
+            public float w;
+            public float h;
+
+            public int startDataOffset;
+            public int endDataOffset;
+            public float yMin;
+            public float yMax;
+
+            public BarData(float _x, float _y, float _w, float _h, int _startDataOffset, int _endDataOffset, float _yMin, float _yMax)
+            {
+                x = _x;
+                y = _y;
+                w = _w;
+                h = _h;
+                startDataOffset = _startDataOffset;
+                endDataOffset = _endDataOffset;
+                yMin = _yMin;
+                yMax = _yMax;
+            }
+        }
+
+        List<BarData> m_Bars = new List<BarData>();
+
+        DisplayUnits m_Units;
+        Rect m_LastRect;
+        int m_MaxFrames;
+
+        string DisplayUnits()
+        {
+            return m_Units.Postfix();
+        }
+
+        string ToDisplayUnits(float ms, bool showUnits = false, int limitToNDigits = 5)
+        {
+            return m_Units.ToString(ms, showUnits, limitToNDigits);
+        }
+
+        public void SetUnits(Units units)
+        {
+            m_Units = new DisplayUnits(units);
+        }
+
+        public void Reset()
+        {
+            m_Zoomed = false;
+            m_Dragging = false;
+            ClearDragSelection();
+
+            m_Moving = false;
+            m_ClickCount = 0;
+            m_MouseReleased = false;
+        }
+
+        void Init()
+        {
+            Reset();
+
+            m_PairedWithFrameTimeGraph = null;
+            m_YAxisMs = 100f;
+            s_YAxisMode = AxisMode.Max;
+            m_IsOrderedByFrameDuration = false;
+
+            m_Enabled = true;
+
+            m_LastRect = new Rect(0, 0, 0, 0);
+            m_MaxFrames = -1;
+        }
+
+        public void MakeGraphActive(bool activate)
+        {
+            if (activate)
+            {
+                if (s_CurrentSelectedGraphId != m_GraphId)
+                {
+                    s_LastSelectedGraphId = m_GraphId;
+                    s_CurrentSelectedGraphId = m_GraphId;
+
+                    // Make sure we are not still selecting another graph
+                    GUIUtility.hotControl = 0;
+
+                    m_SetActive(true);
+                }
+
+                if (GUI.GetNameOfFocusedControl() != "FrameTimeGraph")
+                {
+                    // Take focus away from any other control
+                    // Doesn't really matter what the name is here
+                    GUI.FocusControl("FrameTimeGraph");
+                }
+            }
+            else
+            {
+                if (s_CurrentSelectedGraphId == m_GraphId)
+                {
+                    s_CurrentSelectedGraphId = -1;
+
+                    // Remember this was the active control
+                    // Before this point one of the inner labels would have been active
+                    // GUIUtility.hotControl = m_ControlID;
+
+                    m_SetActive(false);
+                }
+            }
+        }
+
+        public bool IsGraphActive()
+        {
+            if (s_CurrentSelectedGraphId == m_GraphId)
+                return true;
+
+            if (s_LastSelectedGraphId == m_GraphId && GUIUtility.hotControl == m_ControlID)
+                return true;
+
+            return false;
+        }
+
+        public FrameTimeGraph(int graphID, Draw2D draw2D, Units units, Color background, Color backgroundSelected, Color barColor, Color barSelected, Color barMarker, Color barMarkerSelected, Color barThreads, Color barThreadsSelected, Color colorGridlines)
+        {
+            m_GraphId = graphID;
+            m_ControlID = 0;
+
+            m_2D = draw2D;
+            SetUnits(units);
+            Init();
+
+            float ratio = 0.75f;
+            m_ColorBarBackground = background;
+            m_ColorBarBackgroundSelected = backgroundSelected;
+
+            m_ColorBar = barColor;
+            m_ColorBarOutOfRange = new Color(barColor.r * ratio, barColor.g * ratio, barColor.b * ratio);
+            m_ColorBarSelected = barSelected;
+
+            m_ColorBarMarker = barMarker;
+            m_ColorBarMarkerOutOfRange = new Color(barMarker.r * ratio, barMarker.g * ratio, barMarker.b * ratio);
+            m_ColorBarMarkerSelected = barMarkerSelected;
+
+            m_ColorBarThreads = barThreads;
+            m_ColorBarThreadsOutOfRange = new Color(barThreads.r * ratio, barThreads.g * ratio, barThreads.b * ratio);
+            m_ColorBarThreadsSelected = barThreadsSelected;
+
+            m_ColorGridLine = colorGridlines;
+        }
+
+        int ClampToRange(int value, int min, int max)
+        {
+            if (value < min)
+                value = min;
+            if (value > max)
+                value = max;
+
+            return value;
+        }
+
+        int GetDataOffsetForXUnclamped(int xPosition, int width, int totalDataSize)
+        {
+            int visibleDataSize;
+            if (m_Zoomed)
+                visibleDataSize = (m_ZoomEndOffset - m_ZoomStartOffset) + 1;
+            else
+                visibleDataSize = totalDataSize;
+
+            int dataOffset = (int)(xPosition * visibleDataSize / width);
+
+            if (m_Zoomed)
+                dataOffset += m_ZoomStartOffset;
+
+            return dataOffset;
+        }
+
+        int GetDataOffsetForX(int xPosition, int width, int totalDataSize)
+        {
+            //xPosition = ClampToRange(xPosition, 0, width-1);
+            int dataOffset = GetDataOffsetForXUnclamped(xPosition, width, totalDataSize);
+            return ClampToRange(dataOffset, 0, totalDataSize - 1);
+        }
+
+        int GetXForDataOffset(int dataOffset, int width, int totalDataSize)
+        {
+            //frameOffset = ClampToRange(frameOffset, 0, frames-1);
+
+            int visibleDataSize;
+            if (m_Zoomed)
+            {
+                dataOffset = ClampToRange(dataOffset, m_ZoomStartOffset, m_ZoomEndOffset + 1);
+                dataOffset -= m_ZoomStartOffset;
+                visibleDataSize = (m_ZoomEndOffset - m_ZoomStartOffset) + 1;
+            }
+            else
+                visibleDataSize = totalDataSize;
+
+            int x = (int)(dataOffset * width / visibleDataSize);
+
+            x = ClampToRange(x, 0, width - 1);
+            return x;
+        }
+
+        void SetDragMovement(int startOffset, int endOffset, int currentSelectionFirstDataOffset, int currentSelectionLastDataOffset)
+        {
+            // Maintain length but clamp to range
+            int frames = m_Values.Count;
+
+            int currentSelectionRange = currentSelectionLastDataOffset - currentSelectionFirstDataOffset;
+            endOffset = startOffset + currentSelectionRange;
+
+            startOffset = ClampToRange(startOffset, 0, frames - (currentSelectionRange + 1));
+            endOffset = ClampToRange(endOffset, 0, frames - 1);
+
+            SetDragSelection(startOffset, endOffset);
+
+            if (m_PairedWithFrameTimeGraph != null && !m_SingleControlAction)
+            {
+                m_PairedWithFrameTimeGraph.SetDragSelection(m_DragFirstOffset, m_DragLastOffset);
+            }
+        }
+
+        void SetDragSelection(int startOffset, int endOffset, DragDirection dragDirection)
+        {
+            // No need to clamp these as input is clamped.
+            switch (dragDirection)
+            {
+                case DragDirection.Forward:
+                    SetDragSelection(m_DragBeginFirstOffset, endOffset);
+                    break;
+
+                case DragDirection.Backward:
+                    SetDragSelection(startOffset, m_DragBeginLastOffset);
+                    break;
+
+                case DragDirection.Start:
+                    SetDragSelection(startOffset, endOffset);
+
+                    // Record first selected bar range
+                    m_DragBeginFirstOffset = m_DragFirstOffset;
+                    m_DragBeginLastOffset = m_DragLastOffset;
+                    break;
+            }
+
+            if (m_PairedWithFrameTimeGraph != null && !m_SingleControlAction)
+            {
+                m_PairedWithFrameTimeGraph.SetDragSelection(m_DragFirstOffset, m_DragLastOffset);
+            }
+        }
+
+        public void SetDragSelection(int startOffset, int endOffset)
+        {
+            m_DragFirstOffset = startOffset;
+            m_DragLastOffset = endOffset;
+        }
+
+        public void ClearDragSelection()
+        {
+            m_DragFirstOffset = -1;
+            m_DragLastOffset = -1;
+        }
+
+        public bool HasDragRegion()
+        {
+            return (m_DragFirstOffset != -1);
+        }
+
+        public void GetSelectedRange(List<int> frameOffsets, out int firstDataOffset, out int lastDataOffset, out int firstFrameOffset, out int lastFrameOffset)
+        {
+            int frames = m_Values != null ? m_Values.Count : 0;
+
+            firstDataOffset = 0;
+            lastDataOffset = frames - 1;
+            firstFrameOffset = 0;
+            lastFrameOffset = frames - 1;
+
+            if (m_FrameOffsetToDataOffsetMapping.Length > 0)
+            {
+                // By default data is ordered by index so first/last will be the selected visible range
+
+                if (frameOffsets.Count >= 1)
+                {
+                    firstFrameOffset = frameOffsets[0];
+                    lastFrameOffset = firstFrameOffset;
+
+                    firstDataOffset = GetDataOffset(firstFrameOffset);
+                    lastDataOffset = firstDataOffset;
+                }
+                if (frameOffsets.Count >= 2)
+                {
+                    lastFrameOffset = frameOffsets[frameOffsets.Count - 1];
+
+                    lastDataOffset = GetDataOffset(lastFrameOffset);
+                }
+
+                if (m_GlobalSettings.showOrderedByFrameDuration)
+                {
+                    // Need to find the selected items with lowest and highest ms values
+                    if (frameOffsets.Count > 0)
+                    {
+                        int dataOffset = GetDataOffset(firstFrameOffset);
+
+                        firstDataOffset = dataOffset;
+                        lastDataOffset = dataOffset;
+                        float firstDataMS = m_Values[dataOffset].ms;
+                        float lastDataMS = m_Values[dataOffset].ms;
+
+                        foreach (int frameOffset in frameOffsets)
+                        {
+                            dataOffset = GetDataOffset(frameOffset);
+
+                            float ms = m_Values[dataOffset].ms;
+                            if (ms <= firstDataMS && dataOffset < firstDataOffset)
+                            {
+                                firstDataMS = ms;
+                                firstDataOffset = dataOffset;
+                            }
+                            if (ms >= lastDataMS && dataOffset > lastDataOffset)
+                            {
+                                lastDataMS = ms;
+                                lastDataOffset = dataOffset;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        public bool IsMultiSelectControlHeld()
+        {
+#if UNITY_EDITOR_OSX
+            return Event.current.command;
+#else
+            return Event.current.control;
+#endif
+        }
+
+        public State ProcessInput()
+        {
+            if (!IsEnabled())
+                return State.None;
+
+            if (m_Values == null)
+                return State.None;
+
+            if (m_LastRect.width == 0 || m_MaxFrames < 0)
+                return State.None;
+
+            Rect rect = m_LastRect;
+            int maxFrames = m_MaxFrames;
+
+            int dataLength = m_Values.Count;
+            if (dataLength <= 0)
+                return State.None;
+
+            if (m_IsOrderedByFrameDuration != m_GlobalSettings.showOrderedByFrameDuration)
+            {
+                // Reorder if necessary
+                SetData(m_Values);
+            }
+
+            int currentSelectionFirstDataOffset;
+            int currentSelectionLastDataOffset;
+            int currentSelectionFirstFrameOffset;
+            int currentSelectionLastFrameOffset;
+
+            GetSelectedRange(m_LastSelectedFrameOffsets, out currentSelectionFirstDataOffset, out currentSelectionLastDataOffset, out currentSelectionFirstFrameOffset, out currentSelectionLastFrameOffset);
+
+            m_CurrentSelection.Clear();
+            m_CurrentSelection.AddRange(m_LastSelectedFrameOffsets);
+            m_CurrentSelectionFirstDataOffset = currentSelectionFirstDataOffset;
+            m_CurrentSelectionLastDataOffset = currentSelectionLastDataOffset;
+
+            if (Event.current.isKey && Event.current.type == EventType.KeyDown && !m_Dragging && !m_MouseReleased)
+            {
+                if (IsGraphActive())
+                {
+                    int step = Event.current.shift ? 10 : 1;
+                    var eventUsed = false;
+                    switch (Event.current.keyCode)
+                    {
+                        case KeyCode.LeftArrow:
+                            SelectPrevious(step);
+                            eventUsed = true;
+                            break;
+                        case KeyCode.RightArrow:
+                            SelectNext(step);
+                            eventUsed = true;
+                            break;
+                        case KeyCode.Less:
+                        case KeyCode.Comma:
+                            if (Event.current.alt)
+                                SelectShrinkLeft(step);
+                            else
+                                SelectGrowLeft(step);
+                            eventUsed = true;
+                            break;
+                        case KeyCode.Greater:
+                        case KeyCode.Period:
+                            if (Event.current.alt)
+                                SelectShrinkRight(step);
+                            else
+                                SelectGrowRight(step);
+                            eventUsed = true;
+                            break;
+                        case KeyCode.Plus:
+                        case KeyCode.Equals:
+                        case KeyCode.KeypadPlus:
+                            if (Event.current.alt)
+                                SelectShrink(step);
+                            else
+                                SelectGrow(step);
+                            eventUsed = true;
+                            break;
+                        case KeyCode.Underscore:
+                        case KeyCode.Minus:
+                        case KeyCode.KeypadMinus:
+                            if (Event.current.alt)
+                                SelectGrow(step);
+                            else
+                                SelectShrink(step);
+                            eventUsed = true;
+                            break;
+                    }
+
+                    if (eventUsed)
+                        Event.current.Use();
+
+                }
+            }
+
+            float doubleClickTimeout = 0.25f;
+            if (m_MouseReleased)
+            {
+                if ((EditorApplication.timeSinceStartup - m_LastClickTime) > doubleClickTimeout)
+                {
+                    // By this point we will know if its a single or double click
+                    bool append = IsMultiSelectControlHeld();
+                    CallSetRange(m_DragFirstOffset, m_DragLastOffset, m_ClickCount, m_SingleControlAction, FrameTimeGraph.State.DragComplete, append);
+
+                    ClearDragSelection();
+                    if (m_PairedWithFrameTimeGraph != null && !m_SingleControlAction)
+                        m_PairedWithFrameTimeGraph.ClearDragSelection();
+
+                    m_MouseReleased = false;
+                }
+            }
+
+            int width = (int)rect.width;
+            int height = (int)rect.height;
+            float xStart = rect.xMin;
+            if (height > kYAxisDetailThreshold)
+            {
+                float h = GUI.skin.label.lineHeight;
+                xStart += kXAxisWidth;
+                width -= kXAxisWidth;
+            }
+            if (maxFrames > 0)
+            {
+                if (!m_Zoomed)
+                    width = width * dataLength / maxFrames;
+            }
+
+            // Process input
+            Event e = Event.current;
+            if (e.isMouse)
+            {
+                if (m_Dragging)
+                {
+                    if (e.type == EventType.MouseUp)
+                    {
+                        m_Dragging = false;
+                        m_Moving = false;
+
+                        // Delay the action as we are checking for double click
+                        m_MouseReleased = true;
+                        return State.Dragging;
+                    }
+                }
+
+                int x = (int)(e.mousePosition.x - xStart);
+
+                int dataOffset =  GetDataOffsetForXUnclamped(x, width, dataLength);
+                if (m_Moving)
+                    dataOffset -= m_MoveHandleOffset;
+                dataOffset = ClampToRange(dataOffset, 0, dataLength - 1);
+                int frameOffsetBeforeNext = Math.Max(dataOffset,  GetDataOffsetForX(x + 1, width, dataLength) - 1);
+
+                if (m_Dragging)
+                {
+                    if (e.button == 0)
+                    {
+                        // Still dragging (doesn't have to be within the y bounds)
+                        if (m_Moving)
+                        {
+                            // Forward drag from start point
+                            SetDragMovement(dataOffset, frameOffsetBeforeNext, currentSelectionFirstDataOffset, currentSelectionLastDataOffset);
+                        }
+                        else
+                        {
+                            DragDirection dragDirection = (dataOffset < m_DragBeginFirstOffset) ? DragDirection.Backward : DragDirection.Forward;
+                            SetDragSelection(dataOffset, frameOffsetBeforeNext, dragDirection);
+                        }
+
+                        CallSetRange(m_DragFirstOffset, m_DragLastOffset, m_ClickCount, m_SingleControlAction, FrameTimeGraph.State.Dragging);
+                        return State.Dragging;
+                    }
+                }
+                else
+                {
+                    if (e.mousePosition.x >= rect.x && e.mousePosition.x <= rect.xMax &&
+                        e.mousePosition.y >= rect.y && e.mousePosition.y <= rect.yMax)
+                    {
+                        if (e.mousePosition.x >= xStart && e.mousePosition.x <= (xStart + width) &&
+                            e.mousePosition.y >= rect.y && e.mousePosition.y < rect.yMax)
+                        {
+                            MakeGraphActive(true);
+
+                            if (e.type == EventType.MouseDown && e.button == 0)
+                            {
+                                // Drag start (must be within the bounds of the control)
+                                // Might be single or double click
+                                m_LastClickTime = EditorApplication.timeSinceStartup;
+                                m_ClickCount = e.clickCount;
+
+                                m_Dragging = true;
+                                m_Moving = false;
+
+                                if (currentSelectionFirstDataOffset != 0 || currentSelectionLastDataOffset != dataLength - 1)
+                                {
+                                    // Selection is valid
+                                    if (e.shift && dataOffset >= currentSelectionFirstDataOffset && frameOffsetBeforeNext <= currentSelectionLastDataOffset)
+                                    {
+                                        // Moving if shift held and we are inside the current selection range
+                                        m_Moving = true;
+                                    }
+                                }
+
+                                if (m_PairedWithFrameTimeGraph != null)
+                                    m_SingleControlAction = e.alt;  // Record if we are acting only on this control rather than the paired one too
+                                else
+                                    m_SingleControlAction = true;
+
+                                if (m_Moving)
+                                {
+                                    m_MoveHandleOffset = dataOffset - currentSelectionFirstDataOffset;
+
+                                    SetDragMovement(currentSelectionFirstDataOffset, currentSelectionLastDataOffset, currentSelectionFirstDataOffset, currentSelectionLastDataOffset);
+                                }
+                                else
+                                {
+                                    //SetDragSelection(dataOffset, frameOffsetBeforeNext, DragDirection.Start);
+
+                                    // Select just 1 frame
+                                    SetDragSelection(dataOffset, dataOffset, DragDirection.Start);
+                                }
+                                CallSetRange(m_DragFirstOffset, m_DragLastOffset, m_ClickCount, m_SingleControlAction, FrameTimeGraph.State.Dragging);
+                                return State.Dragging;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Left this graph area
+                        MakeGraphActive(false);
+                    }
+                }
+            }
+
+            if (m_MouseReleased)
+            {
+                // Not finished drag fully yet
+                CallSetRange(m_DragFirstOffset, m_DragLastOffset, m_ClickCount, m_SingleControlAction, FrameTimeGraph.State.Dragging);
+                return State.Dragging;
+            }
+
+            return State.None;
+        }
+
+        public float GetDataRange()
+        {
+            if (m_Values == null)
+                return 0f;
+
+            int frames = m_Values.Count;
+
+            float min = 0f;
+            float max = 0f;
+            for (int frameOffset = 0; frameOffset < frames; frameOffset++)
+            {
+                float ms = m_Values[frameOffset].ms;
+                if (ms > max)
+                    max = ms;
+            }
+            float hRange = max - min;
+
+            return hRange;
+        }
+
+        public void PairWith(FrameTimeGraph otherFrameTimeGraph)
+        {
+            if (m_PairedWithFrameTimeGraph != null)
+            {
+                // Clear existing pairing
+                m_PairedWithFrameTimeGraph.m_PairedWithFrameTimeGraph = null;
+            }
+
+            m_PairedWithFrameTimeGraph = otherFrameTimeGraph;
+            if (otherFrameTimeGraph != null)
+                otherFrameTimeGraph.m_PairedWithFrameTimeGraph = this;
+        }
+
+        public FrameTimeGraph GetPairedWith()
+        {
+            return m_PairedWithFrameTimeGraph;
+        }
+
+        public float GetYAxisRange(float yMax)
+        {
+            switch (s_YAxisMode)
+            {
+                case AxisMode.One60HzFrame:
+                    return 1000f / 60f;
+                case AxisMode.Two60HzFrames:
+                    return 2000f / 60f;
+                case AxisMode.Four60HzFrames:
+                    return 4000f / 60f;
+                case AxisMode.Max:
+                    return yMax;
+                case AxisMode.Custom:
+                    return m_YAxisMs;
+            }
+
+            return yMax;
+        }
+
+        public void SetData(List<Data> values)
+        {
+            if (values == null)
+                return;
+
+            m_Values = values;
+
+            if (m_GlobalSettings.showOrderedByFrameDuration)
+                m_Values.Sort((a, b) => { return a.ms.CompareTo(b.ms); });
+            else
+                m_Values.Sort((a, b) => { return a.frameOffset.CompareTo(b.frameOffset); });
+
+            m_FrameOffsetToDataOffsetMapping = new int[m_Values.Count];
+            for (int dataOffset = 0; dataOffset < m_Values.Count; dataOffset++)
+                m_FrameOffsetToDataOffsetMapping[m_Values[dataOffset].frameOffset] = dataOffset;
+
+            m_CurrentSelection.Clear();
+            for (int frameIndex = 0; frameIndex < m_Values.Count; frameIndex++)
+            {
+                m_CurrentSelection.Add(frameIndex);
+            }
+            m_CurrentSelectionFirstDataOffset = 0;
+            m_CurrentSelectionLastDataOffset = m_Values.Count - 1;
+
+            m_IsOrderedByFrameDuration = m_GlobalSettings.showOrderedByFrameDuration;
+        }
+
+        int GetDataOffset(int frameOffset)
+        {
+            if (frameOffset < 0 || frameOffset >= m_FrameOffsetToDataOffsetMapping.Length)
+            {
+                Debug.Log(string.Format("{0} out of range of frame offset to data offset mapping {1}", frameOffset, m_FrameOffsetToDataOffsetMapping.Length));
+                return 0;
+            }
+
+            return m_FrameOffsetToDataOffsetMapping[frameOffset];
+        }
+
+        public void ClearData()
+        {
+            m_Values = null;
+        }
+
+        public bool HasData()
+        {
+            if (m_Values == null)
+                return false;
+            if (m_Values.Count == 0)
+                return false;
+
+            return true;
+        }
+
+        public void SetActiveCallback(SetActive setActive)
+        {
+            m_SetActive = setActive;
+        }
+
+        public void SetRangeCallback(SetRange setRange)
+        {
+            m_SetRange = setRange;
+        }
+
+        void CallSetRange(int startDataOffset, int endDataOffset, int clickCount, bool singleControlAction, FrameTimeGraph.State inputStatus, bool append = false, bool effectPaired = true)
+        {
+            if (m_SetRange == null)
+                return;
+
+            if (startDataOffset < 0 && endDataOffset < 0)
+            {
+                // Clear
+                m_SetRange(new List<int>(), clickCount, inputStatus);
+                return;
+            }
+
+            startDataOffset = Math.Max(0, startDataOffset);
+            endDataOffset = Math.Min(endDataOffset, m_Values.Count - 1);
+
+            List<int> selected = new List<int>();
+            if (append && m_LastSelectedFrameOffsets.Count != m_Values.Count)
+            {
+                foreach (int frameOffset in m_LastSelectedFrameOffsets)
+                {
+                    int dataOffset = m_FrameOffsetToDataOffsetMapping[frameOffset];
+                    if (dataOffset >= 0 && dataOffset < m_Values.Count)
+                    {
+                        selected.Add(frameOffset);
+                    }
+                }
+            }
+            for (int dataOffset = startDataOffset; dataOffset <= endDataOffset; dataOffset++)
+            {
+                if (dataOffset >= 0 && dataOffset < m_Values.Count)
+                {
+                    int frameOffset = m_Values[dataOffset].frameOffset;
+                    if (append == false || !selected.Contains(frameOffset))
+                    {
+                        selected.Add(frameOffset);
+                    }
+                }
+            }
+            // Sort selection in frame index order so start is lowest and end is highest
+            selected.Sort();
+
+            if (selected.Count == 0)
+                return;
+
+            m_SetRange(selected, clickCount, inputStatus);
+
+            if (m_PairedWithFrameTimeGraph != null && m_PairedWithFrameTimeGraph.m_Values.Count > 1 && effectPaired && !singleControlAction)
+            {
+                // Update selection on the other frame time graph
+                int mainMaxFrame = m_Values.Count - 1;
+                int otherMaxFrame = m_PairedWithFrameTimeGraph.m_Values.Count - 1;
+
+                int startOffset = startDataOffset;
+                int endOffset = endDataOffset;
+
+                if (startOffset > otherMaxFrame)
+                {
+                    if (append)
+                    {
+                        // Nothing more to do
+                        return;
+                    }
+
+                    // Select all, if the main selection is outsize the range of the other
+                    startOffset = 0;
+                    endOffset = otherMaxFrame;
+                }
+                else
+                {
+                    if (startOffset == 0 && endOffset == mainMaxFrame)
+                    {
+                        // If clearing main selection then clear the other section fully too
+                        endOffset = otherMaxFrame;
+                    }
+
+                    startOffset = ClampToRange(startOffset, 0, otherMaxFrame);
+                    endOffset = ClampToRange(endOffset, 0, otherMaxFrame);
+                }
+
+                m_PairedWithFrameTimeGraph.CallSetRange(startOffset, endOffset, clickCount, singleControlAction, inputStatus, append, false);
+            }
+        }
+
+        bool HasNoSelection()
+        {
+            if (m_Values == null)
+                return false;
+
+            int frames = m_Values.Count;
+
+            return ((m_CurrentSelectionFirstDataOffset < 0 || m_CurrentSelectionLastDataOffset >= frames) &&
+                (m_CurrentSelectionLastDataOffset < 0 || m_CurrentSelectionLastDataOffset >= frames));
+        }
+
+        bool HasSelectedAll()
+        {
+            if (m_Values == null)
+                return false;
+
+            int frames = m_Values.Count;
+
+            return (m_CurrentSelectionFirstDataOffset == 0 && m_CurrentSelectionLastDataOffset == (frames - 1));
+        }
+
+        bool HasSubsetSelected()
+        {
+            if (m_Values == null)
+                return false;
+
+            return !(HasSelectedAll() || HasNoSelection());
+        }
+
+        void RegenerateBars(float x, float y, float width, float height, float yRange)
+        {
+            int frames = m_Values.Count;
+            if (frames <= 0)
+                return;
+
+            m_Bars.Clear();
+
+            int nextDataOffset =  GetDataOffsetForX(0, (int)width, frames);
+            for (int barX = 0; barX < width; barX++)
+            {
+                int startDataOffset = nextDataOffset;
+                nextDataOffset =  GetDataOffsetForX(barX + 1, (int)width, frames);
+                int endDataOffset = Math.Max(startDataOffset, nextDataOffset - 1);
+
+                float min = m_Values[startDataOffset].ms;
+                float max = min;
+                for (int dataOffset = startDataOffset + 1; dataOffset <= endDataOffset; dataOffset++)
+                {
+                    float ms = m_Values[dataOffset].ms;
+                    if (ms < min)
+                        min = ms;
+                    if (ms > max)
+                        max = ms;
+                }
+                float maxClamped = Math.Min(max, yRange);
+                float h = height * maxClamped / yRange;
+
+                m_Bars.Add(new BarData(x + barX, y, 1, h, startDataOffset, endDataOffset, min, max));
+            }
+        }
+
+        public void SetEnabled(bool enabled)
+        {
+            m_Enabled = enabled;
+        }
+
+        public bool IsEnabled()
+        {
+            return m_Enabled;
+        }
+
+        float GetTotalSelectionTime(List<int> selectedFrameOffsets)
+        {
+            float totalMs = 0;
+            for (int i = 0; i < selectedFrameOffsets.Count; i++)
+            {
+                int frameOffset = selectedFrameOffsets[i];
+                int dataOffset = m_FrameOffsetToDataOffsetMapping[frameOffset];
+                totalMs += m_Values[dataOffset].ms;
+            }
+
+            return totalMs;
+        }
+
+        float GetTotalSelectionTime(int firstOffset, int lastOffset)
+        {
+            float totalMs = 0;
+            for (int frameOffset = firstOffset; frameOffset <= lastOffset; frameOffset++)
+            {
+                if (frameOffset < m_FrameOffsetToDataOffsetMapping.Length)
+                {
+                    int dataOffset = m_FrameOffsetToDataOffsetMapping[frameOffset];
+                    totalMs += m_Values[dataOffset].ms;
+                }
+            }
+
+            return totalMs;
+        }
+
+        void ShowFrameLines(float x, float y, float yRange, float width, float height)
+        {
+            float msSegment = 1000f / 60f;
+            int lines = (int)(yRange / msSegment);
+            int step = 1;
+            for (int line = 1; line <= lines; line += step, step *= 2)
+            {
+                float ms = line * msSegment;
+                float h = height * ms / yRange;
+                m_2D.DrawLine(x, y + h, x + width - 1, y + h, m_ColorGridLine);
+            }
+        }
+
+        bool InSelectedRegion(int startDataOffset, int endDataOffset, int selectedFirstOffset, int selectedLastOffset, Dictionary<int, int> frameOffsetToSelectionIndex, bool subsetSelected)
+        {
+            bool inSelectionRegion = false;
+
+            bool showCurrentSelection = false;
+            if (HasDragRegion())
+            {
+                if (endDataOffset >= selectedFirstOffset && startDataOffset <= selectedLastOffset)
+                {
+                    inSelectionRegion = true;
+                }
+                if (IsMultiSelectControlHeld() && m_LastSelectedFrameOffsets.Count != m_Values.Count)
+                {
+                    // Show current selection too
+                    showCurrentSelection = true;
+                }
+            }
+            else
+            {
+                showCurrentSelection = true;
+            }
+
+            if (showCurrentSelection)
+            {
+                //if (subsetSelected)
+                {
+                    for (int dataOffset = startDataOffset; dataOffset <= endDataOffset; dataOffset++)
+                    {
+                        int frameOffset = m_Values[dataOffset].frameOffset;
+                        if (frameOffsetToSelectionIndex.ContainsKey(frameOffset))
+                        {
+                            inSelectionRegion = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return inSelectionRegion;
+        }
+
+        public void Draw(Rect rect, ProfileAnalysis analysis, List<int> selectedFrameOffsets, float yMax, int offsetToDisplayMapping, int offsetToIndexMapping, string selectedMarkerName, int maxFrames = 0, ProfileAnalysis fullAnalysis = null)
+        {
+            Profiler.BeginSample("FrameTimeGraph.Draw");
+
+            // Must be outside repaint to make sure next controls work correctly (specifically marker name filter)
+            int controlID = GUIUtility.GetControlID(FocusType.Keyboard);
+
+            if (Event.current.type == EventType.Repaint)
+            {
+                m_LastRect = rect;
+
+                // Control id would change during non repaint phase if tooltips displayed if we update this outside the repaint
+                m_ControlID = controlID;
+            }
+
+            m_MaxFrames = maxFrames;
+
+            if (m_Values == null)
+                return;
+
+            m_LastSelectedFrameOffsets = selectedFrameOffsets;
+
+            int totalDataSize = m_Values.Count;
+            if (totalDataSize <= 0)
+                return;
+
+            if (m_IsOrderedByFrameDuration != m_GlobalSettings.showOrderedByFrameDuration)
+            {
+                // Reorder if necessary
+                SetData(m_Values);
+            }
+
+            // Get start and end selection span
+            int currentSelectionFirstDataOffset;
+            int currentSelectionLastDataOffset;
+            int currentSelectionFirstFrameOffset;
+            int currentSelectionLastFrameOffset;
+
+            GetSelectedRange(selectedFrameOffsets, out currentSelectionFirstDataOffset, out currentSelectionLastDataOffset, out currentSelectionFirstFrameOffset, out currentSelectionLastFrameOffset);
+
+
+            // Create mapping from offset to selection for faster selection detection
+            Dictionary<int, int> frameOffsetToSelectionIndex = new Dictionary<int, int>();
+            for (int i = 0; i < selectedFrameOffsets.Count; i++)
+            {
+                int frameOffset = selectedFrameOffsets[i];
+                frameOffsetToSelectionIndex[frameOffset] = i;
+            }
+
+            Event current = Event.current;
+
+            int selectedFirstOffset;
+            int selectedLastOffset;
+            int selectedCount;
+            bool subsetSelected = false;
+            if (HasDragRegion())
+            {
+                selectedFirstOffset = m_DragFirstOffset;
+                selectedLastOffset = m_DragLastOffset;
+
+                if (selectedFirstOffset > m_Values.Count - 1)
+                {
+                    // Selection off the end
+                    selectedFirstOffset = m_Values.Count;
+                    selectedLastOffset = m_Values.Count;
+                    selectedCount = 0;
+                }
+                else
+                {
+                    selectedFirstOffset = ClampToRange(selectedFirstOffset, 0, m_Values.Count - 1);
+                    selectedLastOffset = ClampToRange(selectedLastOffset, 0, m_Values.Count - 1);
+
+                    selectedCount = 1 + (selectedLastOffset - selectedFirstOffset);
+                    subsetSelected = true;
+                }
+            }
+            else
+            {
+                selectedFirstOffset = currentSelectionFirstDataOffset;
+                selectedLastOffset = currentSelectionLastDataOffset;
+                selectedCount = selectedFrameOffsets.Count;
+                subsetSelected = (selectedCount > 0 && selectedCount != totalDataSize);
+            }
+
+            // Draw frames and selection
+            float width = rect.width;
+            float height = rect.height;
+
+            bool showAxis = false;
+            float xStart = 0f;
+            float yStart = 0f;
+            if (height > kYAxisDetailThreshold)
+            {
+                showAxis = true;
+
+                float h = GUI.skin.label.lineHeight;
+                xStart += kXAxisWidth;
+                width -= kXAxisWidth;
+
+                yStart += h;
+                height -= h;
+            }
+            if (maxFrames > 0)
+            {
+                if (!m_Zoomed)
+                    width = width * totalDataSize / maxFrames;
+            }
+
+            // Start / End
+            int startOffset = m_Zoomed ? m_ZoomStartOffset : 0;
+            int endOffset = m_Zoomed ? m_ZoomEndOffset : totalDataSize - 1;
+
+            // Get try index values
+            int startIndex = offsetToDisplayMapping + startOffset;
+            int endIndex = offsetToDisplayMapping + endOffset;
+            int selectedFirstIndex = offsetToDisplayMapping + selectedFirstOffset;
+            int selectedLastIndex = offsetToDisplayMapping + selectedLastOffset;
+
+            string detailsString = "";
+
+            if (!showAxis)
+            {
+                string frameRangeString;
+                if (startIndex == endIndex)
+                    frameRangeString = string.Format("Total Range {0}", startIndex);
+                else
+                    frameRangeString = string.Format("Total Range {0} - {1} [{2}]", startIndex, endIndex, 1 + (endIndex - startIndex));
+
+                // Selection range
+                string selectedTooltip = "";
+                if (subsetSelected)
+                {
+                    if (selectedFirstIndex == selectedLastIndex)
+                        selectedTooltip = string.Format("\nSelected {0}\n", selectedFirstIndex);
+                    else
+                        selectedTooltip = string.Format("\nSelected {0} - {1} [{2}]", selectedFirstIndex, selectedLastIndex, selectedCount);
+                }
+
+                detailsString = string.Format("\n\n{0}{1}", frameRangeString, selectedTooltip);
+            }
+
+            float yRange = GetYAxisRange(yMax);
+
+            bool lastEnabled = GUI.enabled;
+            bool enabled = IsEnabled();
+            GUI.enabled = enabled;
+
+            if (m_2D.DrawStart(rect, Draw2D.Origin.BottomLeft))
+            {
+                float totalMs;
+                if (HasDragRegion())
+                {
+                    totalMs = GetTotalSelectionTime(selectedFirstOffset, selectedLastOffset);
+                }
+                else
+                {
+                    totalMs = GetTotalSelectionTime(selectedFrameOffsets);
+                }
+
+                string timeForSelectedFrames = ToDisplayUnits(totalMs, true, 0);
+                string timeForSelectedFramesClamped = ToDisplayUnits(totalMs, true, 1);
+                string selectionAreaString = string.Format("\n\nTotal time for {0} selected frames\n{1} ({2})", selectedCount, timeForSelectedFrames, timeForSelectedFramesClamped);
+
+                Color selectedControl = GUI.skin.settings.selectionColor;
+
+                if (IsGraphActive())
+                {
+                    m_2D.DrawBox(xStart, yStart, width, height, selectedControl);
+                }
+
+                //xStart -= 1f;
+                yStart += 1f;
+                width -= 1f;
+                height -= 1f;
+
+                m_2D.DrawFilledBox(xStart, yStart, width, height, m_ColorBarBackground);
+
+                RegenerateBars(xStart, yStart, width, height, yRange);
+
+                foreach (BarData bar in m_Bars)
+                {
+                    bool inSelectionRegion = InSelectedRegion(bar.startDataOffset, bar.endDataOffset, selectedFirstOffset, selectedLastOffset, frameOffsetToSelectionIndex, subsetSelected);
+                    if (inSelectionRegion)
+                    {
+                        m_2D.DrawFilledBox(bar.x, bar.y, bar.w, height, m_ColorBarBackgroundSelected);
+                    }
+                }
+
+                if (m_GlobalSettings.showFrameLines)
+                {
+                    ShowFrameLines(xStart, yStart, yRange, width, height);
+                }
+
+                ProfileAnalysis analysisData = analysis;
+                bool full = false;
+                if (fullAnalysis != null)
+                {
+                    analysisData = fullAnalysis;
+                    full = true;
+                }
+
+                MarkerData selectedMarker = (m_GlobalSettings.showSelectedMarker && analysisData != null) ? analysisData.GetMarkerByName(selectedMarkerName) : null;
+                foreach (BarData bar in m_Bars)
+                {
+                    bool inSelectionRegion = InSelectedRegion(bar.startDataOffset, bar.endDataOffset, selectedFirstOffset, selectedLastOffset, frameOffsetToSelectionIndex, subsetSelected);
+                    if (inSelectionRegion)
+                    {
+                        m_2D.DrawFilledBox(bar.x, bar.y, bar.w, bar.h, m_ColorBarSelected);
+                    }
+                    else
+                    {
+                        m_2D.DrawFilledBox(bar.x, bar.y, bar.w, bar.h, m_ColorBar);
+                    }
+
+                    // Show where its been clamped
+                    if (bar.yMax > yRange)
+                    {
+                        m_2D.DrawFilledBox(bar.x, bar.y + height, 1, kOverrunHeight, m_ColorBarOutOfRange);
+                    }
+
+
+                    if (analysisData != null && (full || !m_Dragging))
+                    {
+                        // Analysis is just on the subset
+                        if (m_GlobalSettings.showThreads)
+                        {
+                            Profiler.BeginSample("FrameTimeGraph.ShowThreads");
+                            ShowThreads(height, yRange, bar, full,
+                                analysisData.GetThreads(), subsetSelected, selectedFirstOffset, selectedLastOffset,
+                                offsetToIndexMapping, frameOffsetToSelectionIndex);
+                            Profiler.EndSample();
+                        }
+
+                        if (m_GlobalSettings.showSelectedMarker)
+                        {
+                            // Analysis is just on the subset (unless we have full analysis data)
+                            ShowSelectedMarker(height, yRange, bar, full, selectedMarker, subsetSelected, selectedFirstOffset, selectedLastOffset,
+                                offsetToIndexMapping, frameOffsetToSelectionIndex);
+                        }
+                    }
+                }
+
+                m_2D.DrawEnd();
+
+                if (m_GlobalSettings.showFrameLines && m_GlobalSettings.showFrameLineText)
+                {
+                    ShowFrameLinesText(rect, xStart, yStart, yRange, width, height, subsetSelected, selectedFirstOffset, selectedLastOffset);
+                }
+
+                foreach (BarData bar in m_Bars)
+                {
+                    bool inSelectionRegion = InSelectedRegion(bar.startDataOffset, bar.endDataOffset, selectedFirstOffset, selectedLastOffset, frameOffsetToSelectionIndex, subsetSelected);
+
+                    // Draw tooltip for bar (or 1 pixel segment of bar)
+                    {
+                        int barStartIndex = offsetToDisplayMapping + m_Values[bar.startDataOffset].frameOffset;
+                        int barEndIndex = offsetToDisplayMapping + m_Values[bar.endDataOffset].frameOffset;
+                        string tooltip;
+                        if (barStartIndex == barEndIndex)
+                            tooltip = string.Format("Frame {0}\n{1}{2}", barStartIndex, ToDisplayUnits(bar.yMax, true), detailsString);
+                        else
+                            tooltip = string.Format("Frame {0}-{1}\n{2} max\n{3} min{4}", barStartIndex, barEndIndex, ToDisplayUnits(bar.yMax, true), ToDisplayUnits(bar.yMin, true), detailsString);
+
+                        if (inSelectionRegion)
+                            tooltip += selectionAreaString;
+                        GUI.Label(new Rect(rect.x + bar.x, rect.y + 5, bar.w, height), new GUIContent("", tooltip));
+                    }
+                }
+            }
+
+            GUI.enabled = lastEnabled;
+
+            if (showAxis)
+            {
+                int zoomedSelectedFirstOffset = selectedFirstOffset;
+                int zoomedSelectedLastOffset = selectedLastOffset;
+                int zoomedSelectedCount = selectedCount;
+                if (m_Zoomed)
+                {
+                    if (selectedFirstOffset > endOffset || selectedLastOffset < startOffset)
+                    {
+                        zoomedSelectedCount = 0;
+                    }
+                    else
+                    {
+                        // Clamp selection range to zoom range
+                        zoomedSelectedFirstOffset = ClampToRange(selectedFirstOffset, startOffset, endOffset);
+                        zoomedSelectedLastOffset = ClampToRange(selectedLastOffset, startOffset, endOffset);
+                        if (HasDragRegion())
+                        {
+                            zoomedSelectedCount = 1 + (zoomedSelectedLastOffset - zoomedSelectedFirstOffset);
+                        }
+                        else
+                        {
+                            zoomedSelectedCount = 0;
+                            foreach (var offset in selectedFrameOffsets)
+                            {
+                                if (offset >= startOffset && offset <= endOffset)
+                                {
+                                    zoomedSelectedCount++;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                ShowAxis(rect, xStart, width, startOffset, endOffset, zoomedSelectedFirstOffset, zoomedSelectedLastOffset, zoomedSelectedCount, selectedCount, yMax, totalDataSize, offsetToDisplayMapping);
+            }
+
+            GUI.enabled = enabled;
+            if (rect.Contains(current.mousePosition) && current.type == EventType.ContextClick)
+            {
+                var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+
+                ShowContextMenu(subsetSelected, selectedCount);
+
+                current.Use();
+
+                ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.FrameTimeContextMenu, analytic.GetDurationInSeconds(), true);
+            }
+            GUI.enabled = lastEnabled;
+
+            Profiler.EndSample();
+        }
+
+        void ShowThreads(float height, float yRange, BarData bar, bool full,
+            List<ThreadData> threads, bool subsetSelected, int selectedFirstOffset, int selectedLastOffset,
+            int offsetToIndexMapping,  Dictionary<int, int> frameOffsetToSelectionIndex)
+        {
+            float max = float.MinValue;
+            bool selected = false;
+            for (int dataOffset = bar.startDataOffset; dataOffset <= bar.endDataOffset; dataOffset++)
+            {
+                int frameOffset = m_Values[dataOffset].frameOffset;
+                if (!full && !frameOffsetToSelectionIndex.ContainsKey(frameOffset))
+                    continue;
+
+                float threadMs = 0f;
+                foreach (var thread in threads)
+                {
+                    int frameIndex = offsetToIndexMapping + frameOffset;
+                    var frame = thread.GetFrame(frameIndex);
+                    if (frame == null)
+                        continue;
+
+                    float ms = frame.Value.ms;
+                    if (ms > threadMs)
+                        threadMs = ms;
+                }
+
+                if (threadMs > max)
+                    max = threadMs;
+
+                if (m_Dragging)
+                {
+                    if (frameOffset >= selectedFirstOffset && frameOffset <= selectedLastOffset)
+                        selected = true;
+                }
+                else if (subsetSelected)
+                {
+                    if (frameOffsetToSelectionIndex.ContainsKey(frameOffset))
+                        selected = true;
+                }
+            }
+
+            if (full || selected)
+            {
+                // Clamp to frame time (these values can be time summed over multiple threads)
+                if (max > bar.yMax)
+                    max = bar.yMax;
+
+                float maxClamped = Math.Min(max, yRange);
+                float h = height * maxClamped / yRange;
+
+                m_2D.DrawFilledBox(bar.x, bar.y, bar.w, h, selected ? m_ColorBarThreadsSelected : m_ColorBarThreads);
+
+                // Show where its been clamped
+                if (max > yRange)
+                {
+                    m_2D.DrawFilledBox(bar.x, bar.y + height, bar.w, kOverrunHeight, m_ColorBarThreadsOutOfRange);
+                }
+            }
+        }
+
+        void ShowSelectedMarker(float height, float yRange, BarData bar, bool full,
+            MarkerData selectedMarker, bool subsetSelected, int selectedFirstOffset, int selectedLastOffset,
+            int offsetToIndexMapping,  Dictionary<int, int> frameOffsetToSelectionIndex)
+        {
+            float max = 0f;
+            bool selected = false;
+            if (selectedMarker != null)
+            {
+                for (int dataOffset = bar.startDataOffset; dataOffset <= bar.endDataOffset; dataOffset++)
+                {
+                    int frameOffset = m_Values[dataOffset].frameOffset;
+                    if (!full && !frameOffsetToSelectionIndex.ContainsKey(frameOffset))
+                        continue;
+
+                    float ms = selectedMarker.GetFrameMs(offsetToIndexMapping + frameOffset);
+
+                    if (ms > max)
+                        max = ms;
+
+                    if (m_Dragging)
+                    {
+                        if (frameOffset >= selectedFirstOffset && frameOffset <= selectedLastOffset)
+                            selected = true;
+                    }
+                    else if (subsetSelected)
+                    {
+                        if (frameOffsetToSelectionIndex.ContainsKey(frameOffset))
+                            selected = true;
+                    }
+                }
+            }
+
+            if (full || selected)
+            {
+                // Clamp to frame time (these values can be tiem summed over multiple threads)
+                if (max > bar.yMax)
+                    max = bar.yMax;
+
+                float maxClamped = Math.Min(max, yRange);
+                float h = height * maxClamped / yRange;
+
+                m_2D.DrawFilledBox(bar.x, bar.y, bar.w, h, selected ? m_ColorBarMarkerSelected : m_ColorBarMarker);
+
+                if (max > 0f)
+                {
+                    // we start the bar lower so that very small markers still show up.
+                    m_2D.DrawFilledBox(bar.x, bar.y - kOverrunHeight, bar.w, kOverrunHeight, m_ColorBarMarkerOutOfRange);
+                }
+
+                // Show where its been clamped
+                if (max > yRange)
+                {
+                    m_2D.DrawFilledBox(bar.x, bar.y + height, bar.w, kOverrunHeight, m_ColorBarMarkerOutOfRange);
+                }
+            }
+        }
+
+        void ShowFrameLinesText(Rect rect, float xStart, float yStart, float yRange, float width, float height, bool subsetSelected, int selectedFirstOffset, int selectedLastOffset)
+        {
+            int totalDataSize = m_Values.Count;
+            float y = yStart;
+
+            float msSegment = 1000f / 60f;
+
+            int lines = (int)(yRange / msSegment);
+            int step = 1;
+            for (int line = 1; line <= lines; line += step, step *= 2)
+            {
+                float ms = line * msSegment;
+                float h = height * ms / yRange;
+                int edgePad = 3;
+                if (h >= (height / 4) && h < (height - GUI.skin.label.lineHeight))
+                {
+                    GUIContent content = new GUIContent(ToDisplayUnits((float)Math.Floor(ms), true, 0));
+                    Vector2 size = EditorStyles.miniTextField.CalcSize(content);
+
+                    bool left = true;
+                    if (subsetSelected)
+                    {
+                        float x = GetXForDataOffset(selectedFirstOffset, (int)width, totalDataSize);
+                        float x2 = GetXForDataOffset(selectedLastOffset + 1, (int)width, totalDataSize);
+
+                        // text would overlap selection so move it if that prevents overlap
+                        if (left)
+                        {
+                            if (x < (size.x + edgePad) && x2 < (width - (size.x + edgePad)))
+                                left = false;
+                        }
+                        else
+                        {
+                            if (x > (size.x + edgePad) && x2 > (width - (size.x + edgePad)))
+                                left = true;
+                        }
+                    }
+
+                    Rect r;
+
+                    if (left)
+                        r = new Rect(rect.x + (xStart + edgePad), (rect.y - y) + (height - h), size.x, EditorStyles.miniTextField.lineHeight);
+                    else
+                        r = new Rect(rect.x + (xStart + width) - (size.x + edgePad), (rect.y - y) + (height - h), size.x, EditorStyles.miniTextField.lineHeight);
+                    GUI.Label(r, content, EditorStyles.miniTextField);
+                }
+            }
+        }
+
+        void ShowSelectionMenuItem(bool subsetSelected, GenericMenu menu, GUIContent style, bool state, GenericMenu.MenuFunction func)
+        {
+            if (subsetSelected)
+                menu.AddItem(style, state, func);
+            else
+                menu.AddDisabledItem(style);
+        }
+
+        void ShowContextMenu(bool subsetSelected, int selectionCount)
+        {
+            GenericMenu menu = new GenericMenu();
+            bool showselectionOptions = subsetSelected || ((m_PairedWithFrameTimeGraph != null) && m_PairedWithFrameTimeGraph.HasSubsetSelected());
+            ShowSelectionMenuItem(showselectionOptions || selectionCount == 0, menu, Styles.menuItemSelectAll, false, () => SelectAll());
+            ShowSelectionMenuItem(showselectionOptions || selectionCount == m_Values.Count, menu, Styles.menuItemClearSelection, false, () => ClearSelection());
+            menu.AddItem(Styles.menuItemInvertSelection, false, () => InvertSelection());
+            menu.AddItem(Styles.menuItemSelectMin, false, () => SelectMin());
+            menu.AddItem(Styles.menuItemSelectMax, false, () => SelectMax());
+            menu.AddItem(Styles.menuItemSelectMedian, false, () => SelectMedian());
+            menu.AddSeparator("");
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectPrevious, false, () => SelectPrevious(1));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectNext, false, () => SelectNext(1));
+            menu.AddSeparator("");
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectGrow, false, () => SelectGrow(1));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectShrink, false, () => SelectShrink(1));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectGrowLeft, false, () => SelectGrowLeft(1));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectGrowRight, false, () => SelectGrowRight(1));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectShrinkLeft, false, () => SelectShrinkLeft(1));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectShrinkRight, false, () => SelectShrinkRight(1));
+            menu.AddSeparator("");
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectGrowFast, false, () => SelectGrow(10));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectShrinkFast, false, () => SelectShrink(10));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectGrowLeftFast, false, () => SelectGrowLeft(10));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectGrowRightFast, false, () => SelectGrowRight(10));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectShrinkLeftFast, false, () => SelectShrinkLeft(10));
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemSelectShrinkRightFast, false, () => SelectShrinkRight(10));
+            menu.AddSeparator("");
+            ShowSelectionMenuItem(showselectionOptions, menu, Styles.menuItemZoomSelection, false, () => ZoomSelection());
+            ShowSelectionMenuItem(m_Zoomed, menu, Styles.menuItemZoomAll, false, () => ZoomAll());
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemShowSelectedMarker, m_GlobalSettings.showSelectedMarker, () => ToggleShowSelectedMarker());
+            menu.AddItem(Styles.menuItemShowThreads, m_GlobalSettings.showThreads, () => ToggleShowThreads());
+            menu.AddItem(Styles.menuItemShowFrameLines, m_GlobalSettings.showFrameLines, () => ToggleShowFrameLines());
+            //menu.AddItem(Styles.menuItemShowFrameLineText, m_GlobalSettings.showFrameLineText, () => ToggleShowFrameLinesText());
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemShowOrderedByFrameDuration, m_GlobalSettings.showOrderedByFrameDuration, () => ToggleShowOrderedByFrameDuration());
+
+            menu.ShowAsContext();
+        }
+
+        string GetYMaxText(float value)
+        {
+            return ToDisplayUnits(value, true, 0);
+        }
+
+        void DrawYAxisRangeSelector(Rect rect, float yMax)
+        {
+            string yMaxText = GetYMaxText(yMax);
+
+            List<GUIContent> yAxisOptions = new List<GUIContent>();
+            var graphScaleUnits = ToDisplayUnits(1000f / 60f, true, 0);
+            yAxisOptions.Add(new GUIContent(graphScaleUnits, string.Format("Graph Scale : {0} is equivalent to 60Hz or 60FPS.", graphScaleUnits)));
+            graphScaleUnits = ToDisplayUnits(1000f / 30f, true, 0);
+            yAxisOptions.Add(new GUIContent(graphScaleUnits, string.Format("Graph Scale : {0} is equivalent to 30Hz or 30FPS.", graphScaleUnits)));
+            graphScaleUnits = ToDisplayUnits(1000f / 15f, true, 0);
+            yAxisOptions.Add(new GUIContent(graphScaleUnits, string.Format("Graph Scale : {0} is equivalent to 15Hz or 15FPS.", graphScaleUnits)));
+            yAxisOptions.Add(new GUIContent(yMaxText, "Graph Scale : Max frame time from data"));
+
+            float width = 0;
+            foreach (var content in yAxisOptions)
+            {
+                Vector2 size = EditorStyles.popup.CalcSize(content);
+                if (size.x > width)
+                    width = size.x;
+            }
+
+            // Use smaller width if text is shorter
+            int margin = 2;
+            width = Math.Min(width + margin, rect.width);
+            // Shift right to right align
+            rect.x += (rect.width - width);
+            rect.x -= margin;
+            rect.width = width;
+            s_YAxisMode = (AxisMode)EditorGUI.Popup(rect, (int)s_YAxisMode, yAxisOptions.ToArray());
+        }
+
+        void ShowAxis(Rect rect, float xStart, float width, int startOffset, int endOffset, int selectedFirstOffset, int selectedLastOffset, int selectedCount, int totalSelectedCount, float yMax, int totalDataSize, int offsetToDisplayMapping)
+        {
+            GUIStyle leftAlignStyle = new GUIStyle(GUI.skin.label);
+            leftAlignStyle.padding = new RectOffset(leftAlignStyle.padding.left, leftAlignStyle.padding.right, 0, 0);
+            leftAlignStyle.alignment = TextAnchor.MiddleLeft;
+            GUIStyle rightAlignStyle = new GUIStyle(GUI.skin.label);
+            rightAlignStyle.padding = new RectOffset(rightAlignStyle.padding.left, rightAlignStyle.padding.right, 0, 0);
+            rightAlignStyle.alignment = TextAnchor.MiddleRight;
+
+            // y axis
+            float h = GUI.skin.label.lineHeight;
+            float y = rect.y + ((rect.height - 1) - h);
+
+
+            DrawYAxisRangeSelector(new Rect(rect.x, rect.y, kXAxisWidth, h), yMax);
+
+            string yMinText = ToDisplayUnits(0, true);
+            GUI.Label(new Rect(rect.x, y - h, kXAxisWidth, h), yMinText, rightAlignStyle);
+
+
+            // x axis
+            rect.x += xStart;
+
+            leftAlignStyle.padding = new RectOffset(0, 0, leftAlignStyle.padding.top, leftAlignStyle.padding.bottom);
+            rightAlignStyle.padding = new RectOffset(0, 0, rightAlignStyle.padding.top, rightAlignStyle.padding.bottom);
+
+            int startIndex = offsetToDisplayMapping + startOffset;
+            string startIndexText = string.Format("{0}", startIndex);
+            GUIContent startIndexContent = new GUIContent(startIndexText);
+            Vector2 startIndexSize = GUI.skin.label.CalcSize(startIndexContent);
+            bool drawStart = !m_GlobalSettings.showOrderedByFrameDuration;
+
+            int endIndex = offsetToDisplayMapping + endOffset;
+            string endIndexText = string.Format("{0}", endIndex);
+            GUIContent endIndexContent = new GUIContent(endIndexText);
+            Vector2 endIndexSize = GUI.skin.label.CalcSize(endIndexContent);
+            bool drawEnd = !m_GlobalSettings.showOrderedByFrameDuration;
+
+
+            // Show selection frame values (if space for them)
+            if (totalSelectedCount > 0)
+            {
+                if (selectedCount == 0)
+                {
+                    // If we have no selection then adjust 'selection start/end to span whole view so the count display is centred)
+                    selectedFirstOffset = startOffset;
+                    selectedLastOffset = endOffset;
+                }
+
+                int selectedFirstX = GetXForDataOffset(selectedFirstOffset, (int)width, totalDataSize);
+                int selectedLastX = GetXForDataOffset(selectedLastOffset + 1, (int)width, totalDataSize);   // last + 1 so right hand side of the bbar
+                int selectedRangeWidth = 1 + (selectedLastX - selectedFirstX);
+
+                int selectedFirstIndex = offsetToDisplayMapping + selectedFirstOffset;
+                int selectedLastIndex = offsetToDisplayMapping + selectedLastOffset;
+
+                string selectionCountText;
+                if (totalSelectedCount != selectedCount)
+                    selectionCountText = string.Format("[{0} of {1}]", selectedCount, totalSelectedCount);
+                else
+                    selectionCountText = string.Format("[{0}]", selectedCount);
+
+                string selectionRangeText;
+                if (selectedCount > 1)
+                {
+                    if (m_GlobalSettings.showOrderedByFrameDuration)
+                        selectionRangeText = selectionCountText;
+                    else
+                        selectionRangeText = string.Format("{0} {1} {2}", selectedFirstIndex, selectionCountText, selectedLastIndex);
+                }
+                else
+                    selectionRangeText = string.Format("{0} {1}", selectedFirstIndex, selectionCountText);
+
+                string tooltip = string.Format("{0} frames in selection", selectedCount);
+                if (totalSelectedCount != selectedCount)
+                {
+                    tooltip = string.Format("{0} frames in zoomed selection\n{1} frames in overall selection", selectedCount, totalSelectedCount);
+                }
+
+                GUIContent selectionRangeTextContent = new GUIContent(selectionRangeText, tooltip);
+                Vector2 selectionRangeTextSize = GUI.skin.label.CalcSize(selectionRangeTextContent);
+                if ((selectedRangeWidth > selectionRangeTextSize.x && selectedCount > 1) || selectedCount == 0)
+                {
+                    // Selection width is larger than the text so we can split the text
+                    string selectedFirstIndexText = string.Format("{0}", selectedFirstIndex);
+                    GUIContent selectedFirstIndexContent = new GUIContent(selectedFirstIndexText);
+                    Vector2 selectedFirstIndexSize = GUI.skin.label.CalcSize(selectedFirstIndexContent);
+                    if (m_GlobalSettings.showOrderedByFrameDuration)
+                        selectedFirstIndexSize.x = 0;
+
+                    string selectedLastIndexText = string.Format("{0}", selectedLastIndex);
+                    GUIContent selectedLastIndexContent = new GUIContent(selectedLastIndexText);
+                    Vector2 selectedLastIndexSize = GUI.skin.label.CalcSize(selectedLastIndexContent);
+                    if (m_GlobalSettings.showOrderedByFrameDuration)
+                        selectedLastIndexSize.x = 0;
+
+                    GUIContent selectedCountContent = new GUIContent(selectionCountText, tooltip);
+                    Vector2 selectedCountSize = GUI.skin.label.CalcSize(selectedCountContent);
+
+                    Rect rFirst = new Rect(rect.x + selectedFirstX, y, selectedFirstIndexSize.x, selectedFirstIndexSize.y);
+                    GUI.Label(rFirst, selectedFirstIndexContent);
+
+                    Rect rLast = new Rect(rect.x + selectedLastX - selectedLastIndexSize.x, y, selectedLastIndexSize.x, selectedLastIndexSize.y);
+                    GUI.Label(rLast, selectedLastIndexContent);
+
+                    float mid = selectedFirstX + ((selectedLastX - selectedFirstX) / 2);
+                    Rect rCount = new Rect(rect.x + mid - (selectedCountSize.x / 2), y, selectedCountSize.x, selectedCountSize.y);
+                    GUI.Label(rCount, selectedCountContent);
+
+                    if (selectedFirstX < startIndexSize.x)
+                    {
+                        // would overlap with start text
+                        drawStart = false;
+                    }
+                    if (selectedLastX > ((width - 1) - endIndexSize.x))
+                    {
+                        // would overlap with end text
+                        drawEnd = false;
+                    }
+                }
+                else
+                {
+                    int mid = (selectedFirstX + (selectedRangeWidth / 2));
+                    int selectionTextX = mid - (int)(selectionRangeTextSize.x / 2);
+                    selectionTextX = ClampToRange(selectionTextX, 0, (int)((width - 1) - selectionRangeTextSize.x));
+
+                    Rect rangeRect = new Rect(rect.x + selectionTextX, y, selectionRangeTextSize.x, selectionRangeTextSize.y);
+                    GUI.Label(rangeRect, selectionRangeTextContent);
+
+                    if (selectionTextX < startIndexSize.x)
+                    {
+                        // would overlap with start text
+                        drawStart = false;
+                    }
+                    if ((selectionTextX + selectionRangeTextSize.x) > ((width - 1) - endIndexSize.x))
+                    {
+                        // would overlap with end text
+                        drawEnd = false;
+                    }
+                }
+            }
+
+
+            // Show start and end values
+            if (drawStart)
+            {
+                Rect leftRect = new Rect(rect.x, y, startIndexSize.x, startIndexSize.y);
+                GUI.Label(leftRect, startIndexContent, leftAlignStyle);
+            }
+
+            if (drawEnd)
+            {
+                Rect rightRect = new Rect(rect.x + ((width - 1) - endIndexSize.x), y, endIndexSize.x, endIndexSize.y);
+                GUI.Label(rightRect, endIndexContent, rightAlignStyle);
+            }
+        }
+
+        void ClearSelection(bool effectPaired = true)
+        {
+            int dataLength = m_Values.Count;
+
+            bool singleControlAction = true;    // As we need the frame range to be unique to each data set
+            CallSetRange(-1, -1, 0, singleControlAction, FrameTimeGraph.State.DragComplete);
+
+            // Disable zoom
+            m_Zoomed = false;
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.ClearSelection(false);
+        }
+
+        void SelectAll(bool effectPaired = true)
+        {
+            int dataLength = m_Values.Count;
+
+            bool singleControlAction = true;    // As we need the frame range to be unique to each data set
+            CallSetRange(0, dataLength - 1, 0, singleControlAction, FrameTimeGraph.State.DragComplete);
+
+            // Disable zoom
+            m_Zoomed = false;
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectAll(false);
+        }
+
+        void InvertSelection(bool effectPaired = true)
+        {
+            int dataLength = m_Values.Count;
+
+            Dictionary<int, int> frameOffsetToSelectionIndex = new Dictionary<int, int>();
+            for (int i = 0; i < m_CurrentSelection.Count; i++)
+            {
+                int frameOffset = m_CurrentSelection[i];
+                frameOffsetToSelectionIndex[frameOffset] = i;
+            }
+
+            m_CurrentSelection.Clear();
+            for (int frameIndex = 0; frameIndex < dataLength; frameIndex++)
+            {
+                if (!frameOffsetToSelectionIndex.ContainsKey(frameIndex))
+                    m_CurrentSelection.Add(frameIndex);
+            }
+
+            m_SetRange(m_CurrentSelection, 1, FrameTimeGraph.State.DragComplete);
+
+            // Disable zoom
+            m_Zoomed = false;
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.InvertSelection(false);
+        }
+
+        void ZoomSelection(bool effectPaired = true)
+        {
+            m_Zoomed = true;
+            m_ZoomStartOffset = m_CurrentSelectionFirstDataOffset;
+            m_ZoomEndOffset = m_CurrentSelectionLastDataOffset;
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.ZoomSelection(false);
+        }
+
+        void ZoomAll(bool effectPaired = true)
+        {
+            m_Zoomed = false;
+            int frames = m_Values.Count;
+
+            m_ZoomStartOffset = 0;
+            m_ZoomEndOffset = frames - 1;
+
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.ZoomAll(false);
+        }
+
+        void SelectMin(bool effectPaired = true)
+        {
+            int dataLength = m_Values.Count;
+            if (dataLength <= 0)
+                return;
+
+
+            int minDataOffset = 0;
+            float msMin = m_Values[0].ms;
+            for (int dataOffset = 0; dataOffset < dataLength; dataOffset++)
+            {
+                float ms = m_Values[dataOffset].ms;
+                if (ms < msMin)
+                {
+                    msMin = ms;
+                    minDataOffset = dataOffset;
+                }
+            }
+
+            bool singleControlAction = true;
+            CallSetRange(minDataOffset, minDataOffset, 1, singleControlAction, State.DragComplete); // act like single click, so we select frame
+            //CallSetRange(minDataOffset, minDataOffset, 2, singleControlAction, State.DragComplete); // act like double click, so we jump to the frame
+            m_Zoomed = false;
+
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectMin(false);
+        }
+
+        void SelectMax(bool effectPaired = true)
+        {
+            int dataLength = m_Values.Count;
+            if (dataLength <= 0)
+                return;
+
+
+            int maxDataOffset = 0;
+            float msMax = m_Values[0].ms;
+            for (int dataOffset = 0; dataOffset < dataLength; dataOffset++)
+            {
+                float ms = m_Values[dataOffset].ms;
+                if (ms > msMax)
+                {
+                    msMax = ms;
+                    maxDataOffset = dataOffset;
+                }
+            }
+
+            bool singleControlAction = true;
+            CallSetRange(maxDataOffset, maxDataOffset, 1, singleControlAction, State.DragComplete); // act like single click, so we select frame
+            //CallSetRange(maxDataOffset, maxDataOffset, 2, singleControlAction, State.DragComplete); // act like double click, so we jump to the frame
+            m_Zoomed = false;
+
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectMax(false);
+        }
+
+        float GetPercentageOffset(List<Data> data, float percent, out int outputFrameOffset)
+        {
+            int index = (int)((data.Count - 1) * percent / 100);
+            outputFrameOffset = data[index].frameOffset;
+
+            // True median is half of the sum of the middle 2 frames for an even count. However this would be a value never recorded so we avoid that.
+            return data[index].ms;
+        }
+
+        void SelectMedian(bool effectPaired = true)
+        {
+            int dataLength = m_Values.Count;
+            if (dataLength <= 0)
+                return;
+
+            List<Data> sortedValues = new List<Data>();
+            foreach (var value in m_Values)
+            {
+                Data data = new Data(value.ms, value.frameOffset);
+                sortedValues.Add(data);
+            }
+            // If ms value is the same then order by frame offset
+            sortedValues.Sort((a, b) => { int compare = a.ms.CompareTo(b.ms); return compare == 0 ? a.frameOffset.CompareTo(b.frameOffset) : compare; });
+            int medianFrameOffset = 0;
+            GetPercentageOffset(sortedValues, 50, out medianFrameOffset);
+            int medianDataOffset = m_FrameOffsetToDataOffsetMapping[medianFrameOffset];
+
+
+            bool singleControlAction = true;
+            CallSetRange(medianDataOffset, medianDataOffset, 1, singleControlAction, State.DragComplete); // act like single click, so we select frame
+            //CallSetRange(medianDataOffset, medianDataOffset, 2, singleControlAction, State.DragComplete); // act like double click, so we jump to the frame
+            m_Zoomed = false;
+
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectMedian(false);
+        }
+
+        public void SelectPrevious(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            MoveSelectedRange(-step, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectPrevious(step, false);
+        }
+
+        public void SelectNext(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            MoveSelectedRange(step, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectNext(step, false);
+        }
+
+        public void SelectGrow(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            ResizeSelectedRange(-step, step, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectGrow(step, false);
+        }
+
+        public void SelectGrowLeft(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            ResizeSelectedRange(-step, 0, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectGrowLeft(step, false);
+        }
+
+        public void SelectGrowRight(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            ResizeSelectedRange(0, step, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectGrowRight(step, false);
+        }
+
+        public void SelectShrink(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            ResizeSelectedRange(step, -step, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectShrink(step, false);
+        }
+
+        public void SelectShrinkLeft(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            ResizeSelectedRange(step, 0, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectShrinkLeft(step, false);
+        }
+
+        public void SelectShrinkRight(int step, bool effectPaired = true)
+        {
+            int clicks = 1;
+            bool singleClickAction = true;
+
+            ResizeSelectedRange(0, -step, clicks, singleClickAction, State.DragComplete);
+
+            if (m_PairedWithFrameTimeGraph != null && effectPaired)
+                m_PairedWithFrameTimeGraph.SelectShrinkRight(step, false);
+        }
+
+        public void ToggleShowThreads()
+        {
+            m_GlobalSettings.showThreads ^= true;
+        }
+
+        public void ToggleShowSelectedMarker()
+        {
+            m_GlobalSettings.showSelectedMarker ^= true;
+        }
+
+        public void ToggleShowFrameLines()
+        {
+            m_GlobalSettings.showFrameLines ^= true;
+        }
+
+        public void ToggleShowFrameLinesText()
+        {
+            m_GlobalSettings.showFrameLineText ^= true;
+        }
+
+        public void ToggleShowOrderedByFrameDuration()
+        {
+            m_GlobalSettings.showOrderedByFrameDuration ^= true;
+            SetData(m_Values);  // Update order
+
+            if (m_PairedWithFrameTimeGraph != null)
+            {
+                m_PairedWithFrameTimeGraph.SetData(m_PairedWithFrameTimeGraph.m_Values);  // Update order
+            }
+        }
+
+        internal struct SelectedRangeState
+        {
+            public int currentSelectionFirstDataOffset;
+            public int currentSelectionLastDataOffset;
+            public List<int> lastSelectedFrameOffsets;
+        }
+
+        void MoveSelectedRange(int offset, int clickCount, bool singleControlAction, State inputStatus)
+        {
+            MoveSelectedRange(offset, clickCount, singleControlAction, inputStatus, new SelectedRangeState()
+            {
+                currentSelectionFirstDataOffset = m_CurrentSelectionFirstDataOffset,
+                currentSelectionLastDataOffset = m_CurrentSelectionLastDataOffset,
+                lastSelectedFrameOffsets = m_LastSelectedFrameOffsets,
+            });
+        }
+
+        internal void MoveSelectedRange(int offset, int clickCount, bool singleControlAction, State inputStatus, SelectedRangeState selectedRange)
+        {
+            var currentSelectionFirstDataOffset = selectedRange.currentSelectionFirstDataOffset;
+            var currentSelectionLastDataOffset = selectedRange.currentSelectionLastDataOffset;
+            var lastSelectedFrameOffsets = selectedRange.lastSelectedFrameOffsets;
+
+            if (offset < 0)
+            {
+                // Clamp offset to graph lower bound.
+                if (currentSelectionFirstDataOffset + offset < 0)
+                {
+                    offset = -currentSelectionFirstDataOffset;
+                }
+            }
+            else
+            {
+                // Clamp offset to graph upper bound.
+                if (currentSelectionLastDataOffset + offset >= m_Values.Count)
+                {
+                    offset = (m_Values.Count - 1) - currentSelectionLastDataOffset;
+                }
+            }
+
+            // Offset selection.
+            List<int> selected = new List<int>();
+            foreach (int selectedFrameOffset in lastSelectedFrameOffsets)
+            {
+                var selectedDataOffset = m_FrameOffsetToDataOffsetMapping[selectedFrameOffset];
+                var newDataOffset = selectedDataOffset + offset;
+                if (newDataOffset >= 0 && newDataOffset < m_Values.Count)
+                {
+                    var newFrameOffset = m_Values[newDataOffset].frameOffset;
+                    if (!selected.Contains(newFrameOffset))
+                    {
+                        selected.Add(newFrameOffset);
+                    }
+                }
+            }
+
+            // Sort selection in frame index order.
+            selected.Sort();
+
+            m_SetRange(selected, clickCount, inputStatus);
+        }
+
+        void ResizeSelectedRange(int leftOffset, int rightOffset, int clickCount, bool singleControlAction, State inputState)
+        {
+            ResizeSelectedRange(leftOffset, rightOffset, clickCount, singleControlAction, inputState, new SelectedRangeState()
+            {
+                currentSelectionFirstDataOffset = m_CurrentSelectionFirstDataOffset,
+                currentSelectionLastDataOffset = m_CurrentSelectionLastDataOffset,
+                lastSelectedFrameOffsets = m_LastSelectedFrameOffsets,
+            });
+        }
+
+        internal void ResizeSelectedRange(int leftOffset, int rightOffset, int clickCount, bool singleControlAction, State inputState, SelectedRangeState selectedRange)
+        {
+            const int k_InvalidDataOffset = -1;
+            var currentSelectionFirstDataOffset = selectedRange.currentSelectionFirstDataOffset;
+            var currentSelectionLastDataOffset = selectedRange.currentSelectionLastDataOffset;
+            var lastSelectedFrameOffsets = selectedRange.lastSelectedFrameOffsets;
+
+            // Clamp left offset to lower graph bound.
+            bool isGrowingLeft = leftOffset < 0;
+            if (isGrowingLeft && currentSelectionFirstDataOffset + leftOffset < 0)
+            {
+                leftOffset = -currentSelectionFirstDataOffset;
+            }
+
+            // Clamp right offset to upper graph bound.
+            bool isGrowingRight = rightOffset > 0;
+            if (isGrowingRight && currentSelectionLastDataOffset + rightOffset > (m_Values.Count - 1))
+            {
+                rightOffset = (m_Values.Count - 1) - currentSelectionLastDataOffset;
+            }
+
+            int selectionStartDataOffset = k_InvalidDataOffset;
+            List<int> selected = new List<int>(lastSelectedFrameOffsets);
+            for (int dataOffset = 0; dataOffset < m_Values.Count; ++dataOffset)
+            {
+                var frameOffset = m_Values[dataOffset].frameOffset;
+                if (selectionStartDataOffset == k_InvalidDataOffset)
+                {
+                    // Find selection start.
+                    if (lastSelectedFrameOffsets.Contains(frameOffset))
+                    {
+                        selectionStartDataOffset = dataOffset;
+                    }
+                }
+                else
+                {
+                    // Find selection end.
+                    bool isSelected = lastSelectedFrameOffsets.Contains(frameOffset);
+                    if (!isSelected || dataOffset == (m_Values.Count - 1))
+                    {
+                        int selectionEndDataOffset;
+
+                        // If we reached the last index and it is selected, this index is the selection end. Otherwise, the previous index is the last selected.
+                        bool isLastIndex = dataOffset == (m_Values.Count - 1);
+                        if (isLastIndex && isSelected)
+                        {
+                            selectionEndDataOffset = dataOffset;
+                        }
+                        else
+                        {
+                            selectionEndDataOffset = dataOffset - 1;
+                        }
+
+                        int newSelectionStartDataOffset = Mathf.Clamp(selectionStartDataOffset + leftOffset, 0, m_Values.Count - 1);
+                        int newSelectionEndDataOffset = Mathf.Clamp(selectionEndDataOffset + rightOffset, 0, m_Values.Count - 1);
+
+                        // Enforce a minimum selection width.
+                        if (newSelectionEndDataOffset < newSelectionStartDataOffset)
+                        {
+                            var maximumOffset = (selectionEndDataOffset - selectionStartDataOffset) * 0.5f;
+                            var adjustedLeftOffset = Mathf.CeilToInt(maximumOffset);
+                            newSelectionStartDataOffset = Mathf.Clamp(selectionStartDataOffset + adjustedLeftOffset, 0, m_Values.Count - 1);
+                            var adjustedRightOffset = -Mathf.FloorToInt(maximumOffset);
+                            newSelectionEndDataOffset = Mathf.Clamp(selectionEndDataOffset + adjustedRightOffset, 0, m_Values.Count - 1);
+                        }
+
+                        if (selectionStartDataOffset != newSelectionStartDataOffset)
+                        {
+                            // Resize from left edge.
+                            int startDataOffset = Mathf.Min(selectionStartDataOffset, newSelectionStartDataOffset);
+                            int endDataOffset = Mathf.Max(selectionStartDataOffset, newSelectionStartDataOffset);
+                            MoveSelectionEdge(startDataOffset, endDataOffset, isGrowingLeft, ref selected);
+                        }
+
+                        if (selectionEndDataOffset != newSelectionEndDataOffset)
+                        {
+                            // Resize from right edge (iterate backwards).
+                            int startDataOffset = Mathf.Max(selectionEndDataOffset, newSelectionEndDataOffset);
+                            int endDataOffset = Mathf.Min(selectionEndDataOffset, newSelectionEndDataOffset);
+                            MoveSelectionEdge(startDataOffset, endDataOffset, isGrowingRight, ref selected);
+                        }
+
+                        // Reset to find next selection.
+                        selectionStartDataOffset = k_InvalidDataOffset;
+                    }
+                }
+            }
+
+            // Sort selection in frame index order.
+            selected.Sort();
+
+            m_SetRange(selected, clickCount, inputState);
+        }
+
+        void MoveSelectionEdge(int startDataOffset, int endDataOffset, bool isGrowingFromEdge, ref List<int> selection)
+        {
+            var direction = (startDataOffset >= endDataOffset) ? -1 : 1;
+            for (int dataOffset = startDataOffset; dataOffset != endDataOffset; dataOffset += direction)
+            {
+                var frameOffset = m_Values[dataOffset].frameOffset;
+                var indexInSelection = selection.IndexOf(frameOffset);
+                if (isGrowingFromEdge)
+                {
+                    if (indexInSelection == -1)
+                    {
+                        selection.Add(frameOffset);
+                    }
+                }
+                else
+                {
+                    if (indexInSelection != -1)
+                    {
+                        selection.RemoveAt(indexInSelection);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTimeGraph.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTimeGraph.cs.meta
new file mode 100644
index 0000000..2c0c055
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/FrameTimeGraph.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 54a4b8c3a2d924a4fb740b9044db9694
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Histogram.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Histogram.cs
new file mode 100644
index 0000000..a76f28e
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Histogram.cs
@@ -0,0 +1,131 @@
+using UnityEngine;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class Histogram
+    {
+        Draw2D m_2D;
+        Color m_ColorBarBackground;
+        DisplayUnits m_Units;
+
+        public void SetUnits(Units units)
+        {
+            m_Units = new DisplayUnits(units);
+        }
+
+        public Histogram(Draw2D draw2D, Units units)
+        {
+            m_2D = draw2D;
+            SetUnits(units);
+            m_ColorBarBackground = new Color(0.5f, 0.5f, 0.5f);
+        }
+
+        public Histogram(Draw2D draw2D, Units units, Color barBackground)
+        {
+            m_2D = draw2D;
+            SetUnits(units);
+            m_ColorBarBackground = barBackground;
+        }
+
+        public void DrawStart(float width)
+        {
+            EditorGUILayout.BeginHorizontal(GUILayout.Width(width + 10));
+
+            EditorGUILayout.BeginVertical();
+        }
+
+        public void DrawEnd(float width, float min, float max, float spacing)
+        {
+            EditorGUILayout.BeginHorizontal();
+            float halfWidth = width / 2;
+            GUIStyle leftAlignStyle = new GUIStyle(GUI.skin.label);
+            leftAlignStyle.contentOffset = new Vector2(-5, 0);
+            leftAlignStyle.alignment = TextAnchor.MiddleLeft;
+            GUIStyle rightAlignStyle = new GUIStyle(GUI.skin.label);
+            rightAlignStyle.contentOffset = new Vector2(-5, 0);
+            rightAlignStyle.alignment = TextAnchor.MiddleRight;
+            EditorGUILayout.LabelField(m_Units.ToString(min, false, 5, true), leftAlignStyle, GUILayout.Width(halfWidth));
+            EditorGUILayout.LabelField(m_Units.ToString(max, false, 5, true), rightAlignStyle, GUILayout.Width(halfWidth));
+            EditorGUILayout.EndHorizontal();
+
+            EditorGUILayout.EndVertical();
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        public void DrawBackground(float width, float height, int bucketCount, float min, float max, float spacing)
+        {
+            //bucketCount = (range == 0f) ? 1 : bucketCount;
+
+            float x = (spacing / 2);
+            float y = 0;
+            float w = ((width + spacing) / bucketCount) - spacing;
+            float h = height;
+
+            for (int i = 0; i < bucketCount; i++)
+            {
+                m_2D.DrawFilledBox(x, y, w, h, m_ColorBarBackground);
+                x += w;
+                x += spacing;
+            }
+        }
+
+        public void DrawData(float width, float height, int[] buckets, int totalFrameCount, float min, float max, Color barColor, float spacing)
+        {
+            float range = max - min;
+
+            //int bucketCount = (range == 0f) ? 1 : buckets.Length;
+            int bucketCount = buckets.Length;
+
+            float x = (spacing / 2);
+            float y = 0;
+            float w = ((width + spacing) / bucketCount) - spacing;
+            float h = height;
+
+            float bucketWidth = (range / bucketCount);
+            Rect rect = GUILayoutUtility.GetLastRect();
+            for (int bucketAt = 0; bucketAt < bucketCount; bucketAt++)
+            {
+                var count = buckets[bucketAt];
+
+                float barHeight = (h * count) / totalFrameCount;
+                if (count > 0)  // Make sure we always slow a small bar if non zero
+                    barHeight = Mathf.Max(1.0f, barHeight);
+                m_2D.DrawFilledBox(x, y, w, barHeight, barColor);
+
+                float bucketStart = min + (bucketAt * bucketWidth);
+                float bucketEnd = bucketStart + bucketWidth;
+
+                var tooltip = string.Format("{0}-{1}\n{2} {3}\n\nBar width: {4}",
+                    m_Units.ToTooltipString(bucketStart, false),
+                    m_Units.ToTooltipString(bucketEnd, true),
+                    count,
+                    count == 1 ? "frame" : "frames",
+                    m_Units.ToTooltipString(bucketWidth, true)
+                );
+
+                var content = new GUIContent("", tooltip);
+                GUI.Label(new Rect(rect.x + x, rect.y + y, w, h), content);
+
+                x += w;
+                x += spacing;
+            }
+        }
+
+        public void Draw(float width, float height, int[] buckets, int totalFrameCount, float min, float max, Color barColor)
+        {
+            DrawStart(width);
+
+            float spacing = 2;
+
+            if (m_2D.DrawStart(width, height, Draw2D.Origin.BottomLeft))
+            {
+                DrawBackground(width, height, buckets.Length, min, max, spacing);
+                DrawData(width, height, buckets, totalFrameCount, min, max, barColor, spacing);
+                m_2D.DrawEnd();
+            }
+
+            DrawEnd(width, min, max, spacing);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Histogram.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Histogram.cs.meta
new file mode 100644
index 0000000..51901a4
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Histogram.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dbcb296fb16194f04af7827f37fb2187
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerColumnFilter.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerColumnFilter.cs
new file mode 100644
index 0000000..7c4c0a3
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerColumnFilter.cs
@@ -0,0 +1,49 @@
+using System;
+using UnityEngine.Assertions;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class MarkerColumnFilter
+    {
+        public enum Mode
+        {
+            TimeAndCount,
+            Time,
+            Totals,
+            TimeWithTotals,
+            CountTotals,
+            CountPerFrame,
+            Depth,
+            Threads,
+            Custom,
+        };
+
+        public static readonly string[] ModeNames =
+        {
+            "Time and Count",
+            "Time",
+            "Totals",
+            "Time With Totals",
+            "Count Totals",
+            "Count Per Frame",
+            "Depths",
+            "Threads",
+            "Custom",
+        };
+        public static readonly int[] ModeValues = (int[])Enum.GetValues(typeof(Mode));
+
+        public Mode mode;
+        public int[] visibleColumns;
+
+        public MarkerColumnFilter(Mode newMode)
+        {
+            Assert.AreEqual(ModeNames.Length, ModeValues.Length, "Number of ModeNames should match number of enum values ModeValues: You probably forgot to update one of them.");
+
+            mode = newMode;
+            if (mode == Mode.Custom)
+                mode = Mode.TimeAndCount;
+
+            visibleColumns = null;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerColumnFilter.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerColumnFilter.cs.meta
new file mode 100644
index 0000000..6889acc
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerColumnFilter.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 814ccc2d0c490cf4b871d13ab2e4b7c3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerData.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerData.cs
new file mode 100644
index 0000000..ef92c4c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerData.cs
@@ -0,0 +1,343 @@
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class MarkerData : IComparable<MarkerData>
+    {
+        public string name;
+        public int nameLowerCaseHash;   // lower case name hash for faster comparisons
+
+        public double msTotal;          // total time of this marker on a frame
+        public int count;               // total number of marker calls in the timeline (multiple per frame)
+        public int countMin;            // min count per frame
+        public int countMax;            // max count per frame
+        public float countMean;         // mean over all frames
+        public int countMedian;         // median over all frames
+        public int countLowerQuartile;  // over all frames
+        public int countUpperQuartile;  // over all frames
+        public float countStandardDeviation;
+        public int lastFrame;
+        public int presentOnFrameCount; // number of frames containing this marker
+        public int firstFrameIndex;
+        public float msMean;            // mean over all frames
+        public float msMedian;          // median over all frames
+        public float msLowerQuartile;   // over all frames
+        public float msUpperQuartile;   // over all frames
+        public float msMin;             // min total time per frame
+        public float msMax;             // max total time per frame
+        public float msStandardDeviation;
+        public int minIndividualFrameIndex;
+        public int maxIndividualFrameIndex;
+        public float msMinIndividual;   // min individual function call
+        public float msMaxIndividual;   // max individual function call
+        public float msAtMedian;        // time at median frame
+        public int medianFrameIndex;    // frame this markers median value is found on
+        public int minFrameIndex;
+        public int maxFrameIndex;
+        public int minDepth;
+        public int maxDepth;
+        public List<string> threads;
+
+        const int bucketCount = 20;
+        public int[] buckets;           // Each bucket contains 'number of frames' for 'sum of markers in the frame' in that range
+        public int[] countBuckets;      // Each bucket contains 'number of frames' for 'count in the frame' in that range
+        public List<FrameTime> frames;
+
+        public double timeRemoved;
+        public double timeIgnored;
+
+        public MarkerData(string markerName)
+        {
+            buckets = new int[bucketCount];
+            countBuckets = new int[bucketCount];
+            frames = new List<FrameTime>();
+            threads = new List<string>();
+
+            name = markerName;
+            nameLowerCaseHash = markerName.ToLower().GetHashCode();
+            msTotal = 0.0;
+            count = 0;
+            countMin = 0;
+            countMax = 0;
+            countMean = 0f;
+            countMedian = 0;
+            countLowerQuartile = 0;
+            countUpperQuartile = 0;
+            countStandardDeviation = 0f;
+            lastFrame = -1;
+            presentOnFrameCount = 0;
+            firstFrameIndex = -1;
+            msMean = 0f;
+            msMedian = 0f;
+            msLowerQuartile = 0f;
+            msUpperQuartile = 0f;
+            msMin = float.MaxValue;
+            msMax = float.MinValue;
+            msStandardDeviation = 0f;
+            minIndividualFrameIndex = 0;
+            maxIndividualFrameIndex = 0;
+            msMinIndividual = float.MaxValue;
+            msMaxIndividual = float.MinValue;
+            msAtMedian = 0f;
+            medianFrameIndex = 0;
+            minFrameIndex = 0;
+            maxFrameIndex = 0;
+            minDepth = 0;
+            maxDepth = 0;
+
+            for (int b = 0; b < buckets.Length; b++)
+            {
+                buckets[b] = 0;
+                countBuckets[b] = 0;
+            }
+
+            timeRemoved = 0.0;
+            timeIgnored = 0.0;
+        }
+
+        /// <summary>Compare the time duration between the marker median times. Used for sorting in descending order</summary>
+        /// <param name="other"> The other MarkerData to compare </param>
+        /// <returns>-1 if this is larger, 0 if the same, 1 if this is smaller</returns>
+        public int CompareTo(MarkerData other)
+        {
+            if (msMedian == other.msMedian)
+            {
+                if (medianFrameIndex == other.medianFrameIndex)
+                {
+                    // Tertiary sort by name order
+                    return name.CompareTo(other.name);
+                }
+
+                // Secondary sort by frame index order
+                return medianFrameIndex.CompareTo(other.medianFrameIndex);
+            }
+
+            return -msMedian.CompareTo(other.msMedian);
+        }
+
+        public float GetFrameMs(int frameIndex)
+        {
+            foreach (var frameData in frames)
+            {
+                if (frameData.frameIndex == frameIndex)
+                    return frameData.ms;
+            }
+
+            return 0f;
+        }
+
+        public void ComputeBuckets(float min, float max)
+        {
+            float first = min;
+            float last = max;
+            float range = last - first;
+
+            int maxBucketIndex = (buckets.Length - 1);
+
+            for (int bucketIndex = 0; bucketIndex < buckets.Length; bucketIndex++)
+            {
+                buckets[bucketIndex] = 0;
+            }
+
+            float scale = range > 0 ? buckets.Length / range : 0;
+            // using a for loop instead of foreach is surprisingly faster on Mono
+            for (int i = 0, n = frames.Count; i < n; i++)
+            {
+                var frameTime = frames[i];
+                var ms = frameTime.ms;
+                //int frameIndex = frameTime.frameIndex;
+
+                int bucketIndex = (int)((ms - first) * scale);
+                if (bucketIndex < 0 || bucketIndex > maxBucketIndex)
+                {
+                    // This can happen if a single marker range is longer than the frame start end (which could occur if running on a separate thread)
+                    // It can also occur for the highest entry in the range (max-min/range) = 1
+                    // if (ms > max)    // Check for the spilling case
+                    // Debug.Log(string.Format("Marker {0} : {1}ms exceeds range {2}-{3} on frame {4}", marker.name, ms, first, last, 1+frameIndex));
+
+                    if (bucketIndex > maxBucketIndex)
+                        bucketIndex = maxBucketIndex;
+                    else
+                        bucketIndex = 0;
+                }
+                buckets[bucketIndex] += 1;
+            }
+
+            if (range == 0)
+            {
+                // All buckets will be the same
+                for (int bucketIndex = 1; bucketIndex < buckets.Length; bucketIndex++)
+                {
+                    buckets[bucketIndex] = buckets[0];
+                }
+            }
+        }
+
+        public void ComputeCountBuckets(int min, int max)
+        {
+            float first = min;
+            float last = max;
+            float range = last - first;
+
+            int maxBucketIndex = (countBuckets.Length - 1);
+
+            for (int bucketIndex = 0; bucketIndex < countBuckets.Length; bucketIndex++)
+            {
+                countBuckets[bucketIndex] = 0;
+            }
+
+            float scale = range > 0 ? countBuckets.Length / range : 0;
+            // using a for loop instead of foreach is surprisingly faster on Mono
+            for (int i = 0, n = frames.Count; i < n; i++)
+            {
+                var frameTime = frames[i];
+                var count = frameTime.count;
+
+                int bucketIndex = (int)((count - first) * scale);
+                if (bucketIndex < 0 || bucketIndex > maxBucketIndex)
+                {
+                    if (bucketIndex > maxBucketIndex)
+                        bucketIndex = maxBucketIndex;
+                    else
+                        bucketIndex = 0;
+                }
+                countBuckets[bucketIndex] += 1;
+            }
+
+            if (range == 0)
+            {
+                // All buckets will be the same
+                for (int bucketIndex = 1; bucketIndex < countBuckets.Length; bucketIndex++)
+                {
+                    countBuckets[bucketIndex] = countBuckets[0];
+                }
+            }
+        }
+
+        public static string GetFirstThread(MarkerData marker)
+        {
+            return marker != null ? marker.threads[0] : "";
+        }
+
+        public static float GetMsMax(MarkerData marker)
+        {
+            return marker != null ? marker.msMax : 0.0f;
+        }
+
+        public static int GetMaxFrameIndex(MarkerData marker)
+        {
+            return marker != null ? marker.maxFrameIndex : 0;
+        }
+
+        public static float GetMsMin(MarkerData marker)
+        {
+            return marker != null ? marker.msMin : 0.0f;
+        }
+
+        public static int GetMinFrameIndex(MarkerData marker)
+        {
+            return marker != null ? marker.minFrameIndex : 0;
+        }
+
+        public static float GetMsMedian(MarkerData marker)
+        {
+            return marker != null ? marker.msMedian : 0.0f;
+        }
+
+        public static int GetMedianFrameIndex(MarkerData marker)
+        {
+            return marker != null ? marker.medianFrameIndex : 0;
+        }
+
+        public static float GetMsUpperQuartile(MarkerData marker)
+        {
+            return marker != null ? marker.msUpperQuartile : 0.0f;
+        }
+
+        public static float GetMsLowerQuartile(MarkerData marker)
+        {
+            return marker != null ? marker.msLowerQuartile : 0.0f;
+        }
+
+        public static float GetMsMean(MarkerData marker)
+        {
+            return marker != null ? marker.msMean : 0.0f;
+        }
+
+        public static float GetMsMinIndividual(MarkerData marker)
+        {
+            return marker != null ? marker.msMinIndividual : 0.0f;
+        }
+
+        public static float GetMsMaxIndividual(MarkerData marker)
+        {
+            return marker != null ? marker.msMaxIndividual : 0.0f;
+        }
+
+        public static int GetPresentOnFrameCount(MarkerData marker)
+        {
+            return marker != null ? marker.presentOnFrameCount : 0;
+        }
+
+        public static float GetMsAtMedian(MarkerData marker)
+        {
+            return marker != null ? marker.msAtMedian : 0.0f;
+        }
+
+        public static int GetCountMin(MarkerData marker)
+        {
+            return marker != null ? marker.countMin : 0;
+        }
+
+        public static int GetCountMax(MarkerData marker)
+        {
+            return marker != null ? marker.countMax : 0;
+        }
+
+        public static int GetCount(MarkerData marker)
+        {
+            return marker != null ? marker.count : 0;
+        }
+
+        public static float GetCountMean(MarkerData marker)
+        {
+            return marker != null ? marker.countMean : 0.0f;
+        }
+
+        public static double GetMsTotal(MarkerData marker)
+        {
+            return marker != null ? marker.msTotal : 0.0;
+        }
+
+        public static int GetMinDepth(MarkerData marker)
+        {
+            return marker != null ? marker.minDepth : 0;
+        }
+
+        public static int GetMaxDepth(MarkerData marker)
+        {
+            return marker != null ? marker.maxDepth : 0;
+        }
+        public static double GetTimeRemoved(MarkerData marker)
+        {
+            return marker != null ? marker.timeRemoved : 0.0;
+        }
+        public static double GetTimeIgnored(MarkerData marker)
+        {
+            return marker != null ? marker.timeIgnored : 0.0;
+        }
+
+        public bool IsFullyIgnored()
+        {
+            if (timeIgnored > 0.0)
+            {
+                if (msTotal == 0.0)
+                    return true;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerData.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerData.cs.meta
new file mode 100644
index 0000000..33f8788
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7636f77e28bd3480f9e22fecae16594a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerPairing.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerPairing.cs
new file mode 100644
index 0000000..06893b9
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerPairing.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class MarkerPairing
+    {
+        public string name;
+        public int leftIndex;
+        public int rightIndex;
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerPairing.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerPairing.cs.meta
new file mode 100644
index 0000000..ee48e1b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/MarkerPairing.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 60fdacb48a6fe46529c3c01c96f7d123
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalysis.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalysis.cs
new file mode 100644
index 0000000..99289e0
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalysis.cs
@@ -0,0 +1,405 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class ProfileAnalysis
+    {
+        FrameSummary m_FrameSummary = new FrameSummary();
+        List<MarkerData> m_Markers = new List<MarkerData>();
+        List<ThreadData> m_Threads = new List<ThreadData>();
+
+        public ProfileAnalysis()
+        {
+            m_FrameSummary.first = 0;
+            m_FrameSummary.last = 0;
+            m_FrameSummary.count = 0;
+            m_FrameSummary.msTotal = 0.0;
+            m_FrameSummary.msMin = float.MaxValue;
+            m_FrameSummary.msMax = 0.0f;
+            m_FrameSummary.minFrameIndex = 0;
+            m_FrameSummary.maxFrameIndex = 0;
+            m_FrameSummary.maxMarkerDepth = 0;
+            m_FrameSummary.totalMarkers = 0;
+            m_FrameSummary.markerCountMax = 0;
+            m_FrameSummary.markerCountMaxMean = 0.0f;
+            for (int b = 0; b < m_FrameSummary.buckets.Length; b++)
+                m_FrameSummary.buckets[b] = 0;
+
+            m_Markers.Clear();
+            m_Threads.Clear();
+        }
+
+        public void SetRange(int firstFrameIndex, int lastFrameIndex)
+        {
+            m_FrameSummary.first = firstFrameIndex;
+            m_FrameSummary.last = lastFrameIndex;
+
+            // Ensure these are initialized to frame indices within the range
+            m_FrameSummary.minFrameIndex = firstFrameIndex;
+            // if this wasn't initialized, and all frames had 0 length, it wouldn't be set in the UpdateSummary step of the analysis and point out of range
+            m_FrameSummary.maxFrameIndex = firstFrameIndex;
+        }
+
+        public void AddMarker(MarkerData marker)
+        {
+            m_Markers.Add(marker);
+        }
+
+        public void AddThread(ThreadData thread)
+        {
+            m_Threads.Add(thread);
+        }
+
+        public void UpdateSummary(int frameIndex, float msFrame)
+        {
+            m_FrameSummary.msTotal += msFrame;
+            m_FrameSummary.count += 1;
+            if (msFrame < m_FrameSummary.msMin)
+            {
+                m_FrameSummary.msMin = msFrame;
+                m_FrameSummary.minFrameIndex = frameIndex;
+            }
+            if (msFrame > m_FrameSummary.msMax)
+            {
+                m_FrameSummary.msMax = msFrame;
+                m_FrameSummary.maxFrameIndex = frameIndex;
+            }
+
+            m_FrameSummary.frames.Add(new FrameTime(frameIndex, msFrame, 1));
+        }
+
+        FrameTime GetPercentageOffset(List<FrameTime> frames, float percent, out int outputFrameIndex)
+        {
+            int index = (int)((frames.Count - 1) * percent / 100);
+            outputFrameIndex = frames[index].frameIndex;
+
+            // True median is half of the sum of the middle 2 frames for an even count. However this would be a value never recorded so we avoid that.
+            return frames[index];
+        }
+
+        float GetThreadPercentageOffset(List<ThreadFrameTime> frames, float percent, out int outputFrameIndex)
+        {
+            int index = (int)((frames.Count - 1) * percent / 100);
+            outputFrameIndex = frames[index].frameIndex;
+
+            // True median is half of the sum of the middle 2 frames for an even count. However this would be a value never recorded so we avoid that.
+            return frames[index].ms;
+        }
+
+        void CalculateStandardDeviations(MarkerData marker)
+        {
+            if (marker.frames.Count <= 1)
+            {
+                marker.msStandardDeviation = 0;
+                marker.countStandardDeviation = 0;
+                return;
+            }
+
+            int frameCount = marker.frames.Count;
+            float msMean = marker.msMean;
+            float countMean = marker.countMean;
+
+            double msSum = 0.0;
+            double countSum = 0.0;
+            for (int i = 0; i < frameCount; ++i)
+            {
+                float delta = (marker.frames[i].ms - msMean);
+                msSum += (delta * delta);
+
+                delta = (marker.frames[i].count - countMean);
+                countSum += (delta * delta);
+            }
+
+            double variance = msSum / (frameCount - 1);
+            marker.msStandardDeviation = (float)Math.Sqrt(variance);
+            variance = countSum / (frameCount - 1);
+            marker.countStandardDeviation = (float)Math.Sqrt(variance);
+        }
+
+        public void SetupMarkers()
+        {
+            int countMax = 0;
+            float countMaxMean = 0.0f;
+
+            foreach (MarkerData marker in m_Markers)
+            {
+                marker.msAtMedian = 0.0f;
+                marker.msMin = float.MaxValue;
+                marker.msMax = float.MinValue;
+                marker.minFrameIndex = 0;
+                marker.maxFrameIndex = 0;
+                marker.countMin = int.MaxValue;
+                marker.countMax = int.MinValue;
+
+                foreach (FrameTime frameTime in marker.frames)
+                {
+                    var ms = frameTime.ms;
+                    int frameIndex = frameTime.frameIndex;
+
+                    // Total time for marker over frame
+                    if (ms < marker.msMin)
+                    {
+                        marker.msMin = ms;
+                        marker.minFrameIndex = frameIndex;
+                    }
+                    if (ms > marker.msMax)
+                    {
+                        marker.msMax = ms;
+                        marker.maxFrameIndex = frameIndex;
+                    }
+
+                    if (frameIndex == m_FrameSummary.medianFrameIndex)
+                        marker.msAtMedian = ms;
+
+                    var count = frameTime.count;
+
+                    // count for marker over frame
+                    if (count < marker.countMin)
+                    {
+                        marker.countMin = count;
+                    }
+                    if (count > marker.countMax)
+                    {
+                        marker.countMax = count;
+                    }
+                }
+
+                int unusedIndex;
+
+                marker.msMean = marker.presentOnFrameCount > 0 ? (float)(marker.msTotal / marker.presentOnFrameCount) : 0f;
+                marker.frames.Sort(FrameTime.CompareCount);
+                marker.countMedian = GetPercentageOffset(marker.frames, 50, out marker.medianFrameIndex).count;
+                marker.countLowerQuartile = GetPercentageOffset(marker.frames, 25, out unusedIndex).count;
+                marker.countUpperQuartile = GetPercentageOffset(marker.frames, 75, out unusedIndex).count;
+
+                marker.countMean = marker.presentOnFrameCount > 0 ? (float)marker.count / marker.presentOnFrameCount : 0f;
+                marker.frames.Sort(FrameTime.CompareMs);
+                marker.msMedian = GetPercentageOffset(marker.frames, 50, out marker.medianFrameIndex).ms;
+                marker.msLowerQuartile = GetPercentageOffset(marker.frames, 25, out unusedIndex).ms;
+                marker.msUpperQuartile = GetPercentageOffset(marker.frames, 75, out unusedIndex).ms;
+
+                CalculateStandardDeviations(marker);
+
+                if (marker.countMax > countMax)
+                    countMax = marker.countMax;
+                if (marker.countMean > countMaxMean)
+                    countMaxMean = marker.countMean;
+            }
+
+            m_FrameSummary.markerCountMax = countMax;
+            m_FrameSummary.markerCountMaxMean = countMaxMean;
+        }
+
+        public void SetupMarkerBuckets()
+        {
+            // using a for loop instead of foreach is surprisingly faster on Mono
+            for (int i = 0, n = m_Markers.Count; i < n; i++)
+            {
+                var marker = m_Markers[i];
+                marker.ComputeBuckets(marker.msMin, marker.msMax);
+                marker.ComputeCountBuckets(marker.countMin, marker.countMax);
+            }
+        }
+
+        public void SetupFrameBuckets(float timeScaleMax)
+        {
+            float first = 0;
+            float last = timeScaleMax;
+            float range = last - first;
+
+            int maxBucketIndex = m_FrameSummary.buckets.Length - 1;
+
+            for (int bucketIndex = 0; bucketIndex < m_FrameSummary.buckets.Length; bucketIndex++)
+            {
+                m_FrameSummary.buckets[bucketIndex] = 0;
+            }
+
+            float scale = range > 0 ? m_FrameSummary.buckets.Length / range : 0;
+            // using a for loop instead of foreach is surprisingly faster on Mono
+            for (int i = 0, n = m_FrameSummary.frames.Count; i < n; i++)
+            {
+                var frameData = m_FrameSummary.frames[i];
+                var msFrame = frameData.ms;
+                //var frameIndex = frameData.frameIndex;
+
+                int bucketIndex = (int)((msFrame - first) * scale);
+                if (bucketIndex < 0 || bucketIndex > maxBucketIndex)
+                {
+                    // It can occur for the highest entry in the range (max-min/range) = 1
+                    // if (ms > max)    // Check for the spilling case
+                    // Debug.Log(string.Format("Frame {0}ms exceeds range {1}-{2} on frame {3}", msFrame, first, last, frameIndex));
+                    if (bucketIndex > maxBucketIndex)
+                        bucketIndex = maxBucketIndex;
+                    else
+                        bucketIndex = 0;
+                }
+                m_FrameSummary.buckets[bucketIndex] += 1;
+            }
+
+            if (range == 0)
+            {
+                // All buckets will be the same
+                for (int bucketIndex = 1; bucketIndex < m_FrameSummary.buckets.Length; bucketIndex++)
+                {
+                    m_FrameSummary.buckets[bucketIndex] = m_FrameSummary.buckets[0];
+                }
+            }
+        }
+
+        void CalculateThreadMedians()
+        {
+            foreach (var thread in m_Threads)
+            {
+                if (thread.frames.Count > 0)
+                {
+                    thread.frames.Sort();
+                    int unusedIndex;
+
+                    thread.msMin = GetThreadPercentageOffset(thread.frames, 0, out thread.minFrameIndex);
+                    thread.msLowerQuartile = GetThreadPercentageOffset(thread.frames, 25, out unusedIndex);
+                    thread.msMedian = GetThreadPercentageOffset(thread.frames, 50, out thread.medianFrameIndex);
+                    thread.msUpperQuartile = GetThreadPercentageOffset(thread.frames, 75, out unusedIndex);
+                    thread.msMax = GetThreadPercentageOffset(thread.frames, 100, out thread.maxFrameIndex);
+
+                    // Put back in order of frames
+                    thread.frames.Sort((a, b) => a.frameIndex.CompareTo(b.frameIndex));
+                }
+                else
+                {
+                    thread.msMin = 0f;
+                    thread.msLowerQuartile = 0f;
+                    thread.msMedian = 0f;
+                    thread.msUpperQuartile = 0f;
+                    thread.msMax = 0f;
+                }
+            }
+        }
+
+        public void Finalise(float timeScaleMax, int maxMarkerDepth)
+        {
+            if (m_FrameSummary.frames.Count > 0)
+            {
+                m_FrameSummary.frames.Sort();
+                m_FrameSummary.msMean = (float)(m_FrameSummary.msTotal / m_FrameSummary.count);
+                m_FrameSummary.msMedian = GetPercentageOffset(m_FrameSummary.frames, 50, out m_FrameSummary.medianFrameIndex).ms;
+                int unusedIndex;
+                m_FrameSummary.msLowerQuartile = GetPercentageOffset(m_FrameSummary.frames, 25, out unusedIndex).ms;
+                m_FrameSummary.msUpperQuartile = GetPercentageOffset(m_FrameSummary.frames, 75, out unusedIndex).ms;
+            }
+            else
+            {
+                m_FrameSummary.msMean = 0f;
+                m_FrameSummary.msMedian = 0f;
+                m_FrameSummary.msLowerQuartile = 0f;
+                m_FrameSummary.msUpperQuartile = 0f;
+
+                // This started as float.MaxValue and won't have been updated
+                m_FrameSummary.msMin = 0f;
+            }
+            // No longer need the frame time list ?
+            //m_frameSummary.msFrame.Clear();
+            m_FrameSummary.maxMarkerDepth = maxMarkerDepth;
+
+            if (timeScaleMax <= 0.0f)
+            {
+                // If max frame time range not specified then use the max frame value found.
+                timeScaleMax = m_FrameSummary.msMax;
+            }
+            else if (timeScaleMax < m_FrameSummary.msMax)
+            {
+                Debug.Log(string.Format("Expanding timeScaleMax {0} to match max value found {1}", timeScaleMax, m_FrameSummary.msMax));
+
+                // If max frame time range too small we must expand it.
+                timeScaleMax = m_FrameSummary.msMax;
+            }
+
+            SetupMarkers();
+            SetupMarkerBuckets();
+            SetupFrameBuckets(timeScaleMax);
+
+            // Sort in median order (highest first)
+            m_Markers.Sort(SortByAtMedian);
+
+            CalculateThreadMedians();
+        }
+
+        int SortByAtMedian(MarkerData a, MarkerData b)
+        {
+            if (a.msAtMedian == b.msAtMedian)
+                return -a.medianFrameIndex.CompareTo(b.medianFrameIndex);
+
+            return -a.msAtMedian.CompareTo(b.msAtMedian);
+        }
+
+        public List<MarkerData> GetMarkers()
+        {
+            return m_Markers;
+        }
+
+        public List<ThreadData> GetThreads()
+        {
+            return m_Threads;
+        }
+
+        public ThreadData GetThreadByName(string threadNameWithIndex)
+        {
+            foreach (var thread in m_Threads)
+            {
+                if (thread.threadNameWithIndex == threadNameWithIndex)
+                    return thread;
+            }
+
+            return null;
+        }
+
+        public FrameSummary GetFrameSummary()
+        {
+            return m_FrameSummary;
+        }
+
+        public MarkerData GetMarker(int index)
+        {
+            if (index < 0 || index >= m_Markers.Count)
+                return null;
+
+            return m_Markers[index];
+        }
+
+        public int GetMarkerIndexByName(string markerName)
+        {
+            if (markerName == null)
+                return -1;
+
+            for (int index = 0; index < m_Markers.Count; index++)
+            {
+                var marker = m_Markers[index];
+                if (marker.name == markerName)
+                {
+                    return index;
+                }
+            }
+
+            return -1;
+        }
+
+        public MarkerData GetMarkerByName(string markerName)
+        {
+            if (markerName == null)
+                return null;
+
+            for (int index = 0; index < m_Markers.Count; index++)
+            {
+                var marker = m_Markers[index];
+                if (marker.name == markerName)
+                {
+                    return marker;
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalysis.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalysis.cs.meta
new file mode 100644
index 0000000..8996afd
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalysis.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f7cee1025e74448acbbb8bf2b82d9bfc
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzer.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzer.cs
new file mode 100644
index 0000000..d81018e
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzer.cs
@@ -0,0 +1,553 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditorInternal;
+using System.Text.RegularExpressions;
+using System;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class ProfileAnalyzer
+    {
+        public const int kDepthAll = -1;
+
+        int m_Progress = 0;
+        ProfilerFrameDataIterator m_frameData;
+        List<string> m_threadNames = new List<string>();
+        ProfileAnalysis m_analysis;
+
+        public ProfileAnalyzer()
+        {
+        }
+
+        public void QuickScan()
+        {
+            var frameData = new ProfilerFrameDataIterator();
+
+            m_threadNames.Clear();
+            int frameIndex = 0;
+            int threadCount = frameData.GetThreadCount(0);
+            frameData.SetRoot(frameIndex, 0);
+
+            Dictionary<string, int> threadNameCount = new Dictionary<string, int>();
+            for (int threadIndex = 0; threadIndex < threadCount; ++threadIndex)
+            {
+                frameData.SetRoot(frameIndex, threadIndex);
+
+                var threadName = frameData.GetThreadName();
+                var groupName = frameData.GetGroupName();
+                threadName = ProfileData.GetThreadNameWithGroup(threadName, groupName);
+
+                if (!threadNameCount.ContainsKey(threadName))
+                    threadNameCount.Add(threadName, 1);
+                else
+                    threadNameCount[threadName] += 1;
+
+                string threadNameWithIndex = ProfileData.ThreadNameWithIndex(threadNameCount[threadName], threadName);
+                threadNameWithIndex = ProfileData.CorrectThreadName(threadNameWithIndex);
+
+                m_threadNames.Add(threadNameWithIndex);
+            }
+
+            frameData.Dispose();
+        }
+
+        public List<string> GetThreadNames()
+        {
+            return m_threadNames;
+        }
+
+        void CalculateFrameTimeStats(ProfileData data, out float median, out float mean, out float standardDeviation)
+        {
+            List<float> frameTimes = new List<float>();
+            for (int frameIndex = 0; frameIndex < data.GetFrameCount(); frameIndex++)
+            {
+                var frame = data.GetFrame(frameIndex);
+                float msFrame = frame.msFrame;
+                frameTimes.Add(msFrame);
+            }
+            frameTimes.Sort();
+            median = frameTimes[frameTimes.Count / 2];
+
+
+            double total = 0.0f;
+            foreach (float msFrame in frameTimes)
+            {
+                total += msFrame;
+            }
+            mean = (float)(total / (double)frameTimes.Count);
+
+
+            if (frameTimes.Count <= 1)
+            {
+                standardDeviation = 0f;
+            }
+            else
+            {
+                total = 0.0f;
+                foreach (float msFrame in frameTimes)
+                {
+                    float d = msFrame - mean;
+                    total += (d * d);
+                }
+                total /= (frameTimes.Count - 1);
+                standardDeviation = (float)Math.Sqrt(total);
+            }
+        }
+
+        int GetClampedOffsetToFrame(ProfileData profileData, int frameIndex)
+        {
+            int frameOffset = profileData.DisplayFrameToOffset(frameIndex);
+            if (frameOffset < 0)
+            {
+                Debug.Log(string.Format("Frame index {0} offset {1} < 0, clamping", frameIndex, frameOffset));
+                frameOffset = 0;
+            }
+            if (frameOffset >= profileData.GetFrameCount())
+            {
+                Debug.Log(string.Format("Frame index {0} offset {1} >= frame count {2}, clamping", frameIndex, frameOffset, profileData.GetFrameCount()));
+                frameOffset = profileData.GetFrameCount() - 1;
+            }
+
+            return frameOffset;
+        }
+
+        public static bool MatchThreadFilter(string threadNameWithIndex, List<string> threadFilters)
+        {
+            if (threadFilters == null || threadFilters.Count == 0)
+                return false;
+
+            if (threadFilters.Contains(threadNameWithIndex))
+                return true;
+
+            return false;
+        }
+
+        public bool IsNullOrWhiteSpace(string s)
+        {
+            // return string.IsNullOrWhiteSpace(parentMarker);
+            if (s == null || Regex.IsMatch(s, @"^[\s]*$"))
+                return true;
+
+            return false;
+        }
+
+        public void RemoveMarkerTimeFromParents(MarkerData[] markers, ProfileData profileData, ProfileThread threadData, int markerAt)
+        {
+            // Get the info for the marker we plan to remove (assume thats what we are at)
+            ProfileMarker profileMarker = threadData.markers[markerAt];
+            float markerTime = profileMarker.msMarkerTotal;
+
+            // Traverse parents and remove time from them
+            int currentDepth = profileMarker.depth;
+            for (int parentMarkerAt = markerAt - 1; parentMarkerAt >= 0; parentMarkerAt--)
+            {
+                ProfileMarker parentMarkerData = threadData.markers[parentMarkerAt];
+                if (parentMarkerData.depth == currentDepth - 1)
+                {
+                    currentDepth--;
+                    if (parentMarkerData.nameIndex < markers.Length) // Had an issue where marker not yet processed(marker from another thread)
+                    {
+                        MarkerData parentMarker = markers[parentMarkerData.nameIndex];
+
+                        // If a depth slice is applied we may not have a parent marker stored
+                        if (parentMarker != null)
+                        {
+                            // Revise the duration of parent to remove time from there too
+                            // Note if the marker to remove is nested (i.e. parent of the same name, this could reduce the msTotal, more than we add to the timeIgnored)
+                            parentMarker.msTotal -= markerTime;
+
+                            // Reduce from the max marker time too
+                            // This could be incorrect when there are many instances that contribute the the total time
+                            if (parentMarker.msMaxIndividual > markerTime)
+                            {
+                                parentMarker.msMaxIndividual -= markerTime;
+                            }
+                            if (parentMarker.msMinIndividual > markerTime)
+                            {
+                                parentMarker.msMinIndividual -= markerTime;
+                            }
+
+                            // Revise stored frame time
+                            FrameTime frameTime = parentMarker.frames[parentMarker.frames.Count - 1];
+                            frameTime = new FrameTime(frameTime.frameIndex, frameTime.ms - markerTime, frameTime.count);
+                            parentMarker.frames[parentMarker.frames.Count - 1] = frameTime;
+
+                            // Note that we have modified the time
+                            parentMarker.timeRemoved += markerTime;
+
+                            // Note markerTime can be 0 in some cases.
+                            // Make sure timeRemoved is never left at 0.0
+                            // This makes sure we can test for non zero to indicate the marker has been removed 
+                            if (parentMarker.timeRemoved == 0.0)
+                                parentMarker.timeRemoved = double.Epsilon;
+                        }
+                    }
+                }
+            }
+        }
+
+        public int RemoveMarker(ProfileThread threadData, int markerAt)
+        {
+            ProfileMarker profileMarker = threadData.markers[markerAt];
+            int at = markerAt;
+
+            // skip marker
+            at++;
+
+            // Skip children
+            int currentDepth = profileMarker.depth;
+            while (at < threadData.markers.Count)
+            {
+                profileMarker = threadData.markers[at];
+                if (profileMarker.depth <= currentDepth)
+                    break;
+
+                at++;
+            }
+
+            // Mark the following number to be ignored
+            int markerAndChildCount = at - markerAt;
+
+            return markerAndChildCount;
+        }
+
+        public ProfileAnalysis Analyze(ProfileData profileData, List<int> selectionIndices, List<string> threadFilters, int depthFilter, bool selfTimes = false, string parentMarker = null, float timeScaleMax = 0, string removeMarker = null)
+        {
+            m_Progress = 0;
+            if (profileData == null)
+            {
+                return null;
+            }
+            if (profileData.GetFrameCount() <= 0)
+            {
+                return null;
+            }
+
+            int frameCount = selectionIndices.Count;
+            if (frameCount < 0)
+            {
+                return null;
+            }
+
+            if (profileData.HasFrames && !profileData.HasThreads)
+            {
+                if (!ProfileData.Load(profileData.FilePath, out profileData))
+                {
+                    return null;
+                }
+            }
+
+            bool processMarkers = (threadFilters != null);
+
+            ProfileAnalysis analysis = new ProfileAnalysis();
+            if (selectionIndices.Count > 0)
+                analysis.SetRange(selectionIndices[0], selectionIndices[selectionIndices.Count - 1]);
+            else
+                analysis.SetRange(0, 0);
+
+            m_threadNames.Clear();
+
+            int maxMarkerDepthFound = 0;
+            var threads = new Dictionary<string, ThreadData>();
+            var markers = new MarkerData[profileData.MarkerNameCount];
+            var removedMarkers = new Dictionary<string, double>();
+
+            var mainThreadIdentifier = new ThreadIdentifier("Main Thread", 1);
+
+            int markerCount = 0;
+
+            bool filteringByParentMarker = false;
+            int parentMarkerIndex = -1;
+            if (!IsNullOrWhiteSpace(parentMarker))
+            {
+                // Returns -1 if this marker doesn't exist in the data set
+                parentMarkerIndex = profileData.GetMarkerIndex(parentMarker);
+                filteringByParentMarker = true;
+            }
+
+            int at = 0;
+            foreach (int frameIndex in selectionIndices)
+            {
+                int frameOffset = profileData.DisplayFrameToOffset(frameIndex);
+                var frameData = profileData.GetFrame(frameOffset);
+                if (frameData == null)
+                    continue;
+                var msFrame = frameData.msFrame;
+
+                if (processMarkers)
+                {
+                    // get the file reader in case we need to rebuild the markers rather than opening
+                    // the file for every marker
+                    for (int threadIndex = 0; threadIndex < frameData.threads.Count; threadIndex++)
+                    {
+                        float msTimeOfMinDepthMarkers = 0.0f;
+                        float msIdleTimeOfMinDepthMarkers = 0.0f;
+
+                        var threadData = frameData.threads[threadIndex];
+                        var threadNameWithIndex = profileData.GetThreadName(threadData);
+
+                        ThreadData thread;
+                        if (!threads.ContainsKey(threadNameWithIndex))
+                        {
+                            m_threadNames.Add(threadNameWithIndex);
+
+                            thread = new ThreadData(threadNameWithIndex);
+
+                            analysis.AddThread(thread);
+                            threads[threadNameWithIndex] = thread;
+
+                            // Update threadsInGroup for all thread records of the same group name
+                            foreach (var threadAt in threads.Values)
+                            {
+                                if (threadAt == thread)
+                                    continue;
+
+                                if (thread.threadGroupName == threadAt.threadGroupName)
+                                {
+                                    threadAt.threadsInGroup += 1;
+                                    thread.threadsInGroup += 1;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            thread = threads[threadNameWithIndex];
+                        }
+
+                        bool include = MatchThreadFilter(threadNameWithIndex, threadFilters);
+
+                        int parentMarkerDepth = -1;
+
+                        if (threadData.markers.Count != threadData.markerCount)
+                        {
+                            if (!threadData.ReadMarkers(profileData.FilePath))
+                            {
+                                Debug.LogError("failed to read markers");
+                            }
+                        }
+
+                        int markerAndChildCount = 0;
+                        for (int markerAt = 0, n = threadData.markers.Count; markerAt < n; markerAt++)
+                        {
+                            var markerData = threadData.markers[markerAt];
+
+                            if (markerAndChildCount > 0)
+                                markerAndChildCount--;
+
+                            string markerName = null;
+
+                            float ms = markerData.msMarkerTotal - (selfTimes ? markerData.msChildren : 0);
+                            var markerDepth = markerData.depth;
+                            if (markerDepth > maxMarkerDepthFound)
+                                maxMarkerDepthFound = markerDepth;
+
+                            if (markerDepth == 1)
+                            {
+                                markerName = profileData.GetMarkerName(markerData);
+                                if (markerName.Equals("Idle", StringComparison.Ordinal))
+                                    msIdleTimeOfMinDepthMarkers += ms;
+                                else
+                                    msTimeOfMinDepthMarkers += ms;
+                            }
+
+                            if (removeMarker != null)
+                            {
+                                if (markerAndChildCount <= 0)   // If we are already removing markers - don't focus on other occurances in the children
+                                {
+                                    if (markerName == null)
+                                        markerName = profileData.GetMarkerName(markerData);
+
+                                    if (markerName == removeMarker)
+                                    {
+                                        float removeMarkerTime = markerData.msMarkerTotal;
+
+                                        // Remove this markers time from frame time (if its on the main thread)
+                                        if (thread.threadNameWithIndex == mainThreadIdentifier.threadNameWithIndex)
+                                        {
+                                            msFrame -= removeMarkerTime;
+                                        }
+
+                                        if (selfTimes == false) // (Self times would not need thread or parent adjustments)
+                                        {
+                                            // And from thread time
+                                            if (markerName == "Idle")
+                                                msIdleTimeOfMinDepthMarkers -= removeMarkerTime;
+                                            else
+                                                msTimeOfMinDepthMarkers -= removeMarkerTime;
+
+                                            // And from parents
+                                            RemoveMarkerTimeFromParents(markers, profileData, threadData, markerAt);
+                                        }
+
+                                        markerAndChildCount = RemoveMarker(threadData, markerAt);
+                                    }
+                                }
+                            }
+
+                            if (!include)
+                                continue;
+
+                            // If only looking for markers below the parent
+                            if (filteringByParentMarker)
+                            {
+                                // If found the parent marker
+                                if (markerData.nameIndex == parentMarkerIndex)
+                                {
+                                    // And we are not already below the parent higher in the depth tree
+                                    if (parentMarkerDepth < 0)
+                                    {
+                                        // record the parent marker depth
+                                        parentMarkerDepth = markerData.depth;
+                                    }
+                                }
+                                else
+                                {
+                                    // If we are now above or beside the parent marker then we are done for this level
+                                    if (markerData.depth <= parentMarkerDepth)
+                                    {
+                                        parentMarkerDepth = -1;
+                                    }
+                                }
+
+                                if (parentMarkerDepth < 0)
+                                    continue;
+                            }
+
+                            if (depthFilter != kDepthAll && markerDepth != depthFilter)
+                                continue;
+
+                            MarkerData marker = markers[markerData.nameIndex];
+                            if (marker != null)
+                            {
+                                if (!marker.threads.Contains(threadNameWithIndex))
+                                    marker.threads.Add(threadNameWithIndex);
+                            }
+                            else
+                            {
+                                if (markerName == null)
+                                    markerName = profileData.GetMarkerName(markerData);
+                                marker = new MarkerData(markerName);
+                                marker.firstFrameIndex = frameIndex;
+                                marker.minDepth = markerDepth;
+                                marker.maxDepth = markerDepth;
+                                marker.threads.Add(threadNameWithIndex);
+                                analysis.AddMarker(marker);
+                                markers[markerData.nameIndex] = marker;
+                                markerCount += 1;
+                            }
+                            marker.count += 1;
+
+                            if (markerAndChildCount > 0)
+                            {
+                                marker.timeIgnored += ms;
+
+                                // Note ms can be 0 in some cases.
+                                // Make sure timeIgnored is never left at 0.0
+                                // This makes sure we can test for non zero to indicate the marker has been ignored 
+                                if (marker.timeIgnored == 0.0)
+                                    marker.timeIgnored = double.Epsilon;
+
+                                // zero out removed marker time
+                                // so we don't record in the individual marker times, marker frame times or min/max times
+                                // ('min/max times' is calculated later from marker frame times)
+                                ms = 0f;
+                            }
+
+                            marker.msTotal += ms;
+
+                            // Individual marker time (not total over frame)
+                            if (ms < marker.msMinIndividual)
+                            {
+                                marker.msMinIndividual = ms;
+                                marker.minIndividualFrameIndex = frameIndex;
+                            }
+                            if (ms > marker.msMaxIndividual)
+                            {
+                                marker.msMaxIndividual = ms;
+                                marker.maxIndividualFrameIndex = frameIndex;
+                            }
+
+                            // Record highest depth foun
+                            if (markerDepth < marker.minDepth)
+                                marker.minDepth = markerDepth;
+                            if (markerDepth > marker.maxDepth)
+                                marker.maxDepth = markerDepth;
+
+                            FrameTime frameTime;
+                            if (frameIndex != marker.lastFrame)
+                            {
+                                marker.presentOnFrameCount += 1;
+                                frameTime = new FrameTime(frameIndex, ms, 1);
+                                marker.frames.Add(frameTime);
+                                marker.lastFrame = frameIndex;
+                            }
+                            else
+                            {
+                                frameTime = marker.frames[marker.frames.Count - 1];
+                                frameTime = new FrameTime(frameTime.frameIndex, frameTime.ms + ms, frameTime.count + 1);
+                                marker.frames[marker.frames.Count - 1] = frameTime;
+                            }
+                        }
+
+                        if (include)
+                            thread.frames.Add(new ThreadFrameTime(frameIndex, msTimeOfMinDepthMarkers, msIdleTimeOfMinDepthMarkers));
+                    }
+                }
+
+                analysis.UpdateSummary(frameIndex, msFrame);
+
+                at++;
+                m_Progress = (100 * at) / frameCount;
+            }
+
+            analysis.GetFrameSummary().totalMarkers = profileData.MarkerNameCount;
+            analysis.Finalise(timeScaleMax, maxMarkerDepthFound);
+
+            /*
+            foreach (int frameIndex in selectionIndices)
+            {
+                int frameOffset = profileData.DisplayFrameToOffset(frameIndex);
+
+                var frameData = profileData.GetFrame(frameOffset);
+                foreach (var threadData in frameData.threads)
+                {
+                    var threadNameWithIndex = profileData.GetThreadName(threadData);
+
+                    if (filterThreads && threadFilter != threadNameWithIndex)
+                        continue;
+
+                    const bool enterChildren = true;
+                    foreach (var markerData in threadData.markers)
+                    {
+                        var markerName = markerData.name;
+                        var ms = markerData.msFrame;
+                        var markerDepth = markerData.depth;
+                        if (depthFilter != kDepthAll && markerDepth != depthFilter)
+                            continue;
+
+                        MarkerData marker = markers[markerName];
+                        bucketIndex = (range > 0) ? (int)(((marker.buckets.Length-1) * (ms - first)) / range) : 0;
+                        if (bucketIndex<0 || bucketIndex > (marker.buckets.Length - 1))
+                        {
+                            // This can happen if a single marker range is longer than the frame start end (which could occur if running on a separate thread)
+                            // Debug.Log(string.Format("Marker {0} : {1}ms exceeds range {2}-{3} on frame {4}", marker.name, ms, first, last, frameIndex));
+                            if (bucketIndex > (marker.buckets.Length - 1))
+                                bucketIndex = (marker.buckets.Length - 1);
+                            else
+                                bucketIndex = 0;
+                        }
+                        marker.individualBuckets[bucketIndex] += 1;
+                    }
+                }
+            }
+*/
+            m_Progress = 100;
+            return analysis;
+        }
+
+        public int GetProgress()
+        {
+            return m_Progress;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzer.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzer.cs.meta
new file mode 100644
index 0000000..c6c10c7
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 317d76fd107c444c7822b9c99d48bd30
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerExportWindow.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerExportWindow.cs
new file mode 100644
index 0000000..193decf
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerExportWindow.cs
@@ -0,0 +1,281 @@
+using UnityEngine;
+using System.IO;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class ProfileAnalyzerExportWindow : EditorWindow
+    {
+        internal static class Styles
+        {
+            public static readonly GUIContent markerTable = new GUIContent("Marker table", "Export data from the single view marker table");
+            public static readonly GUIContent singleFrameTimes = new GUIContent("Single Frame Times", "Export frame time data from the single view");
+            public static readonly GUIContent comparisonTables = new GUIContent("Comparison table", "Export data from the comparsion view marker table");
+            public static readonly GUIContent comparisonFrameTimes = new GUIContent("Comparison Frame Times", "Export frame time data from the comparison view");
+        }
+
+        ProfileAnalyzerWindow m_ProfileAnalyzerWindow;
+
+        ProfileDataView m_ProfileDataView;
+        ProfileDataView m_LeftDataView;
+        ProfileDataView m_RightDataView;
+
+        static public ProfileAnalyzerExportWindow FindOpenWindow()
+        {
+            UnityEngine.Object[] windows = Resources.FindObjectsOfTypeAll(typeof(ProfileAnalyzerExportWindow));
+            if (windows != null && windows.Length > 0)
+                return windows[0] as ProfileAnalyzerExportWindow;
+
+            return null;
+        }
+
+        static public bool IsOpen()
+        {
+            if (FindOpenWindow() != null)
+                return true;
+
+            return false;
+        }
+
+        static public ProfileAnalyzerExportWindow Open(float screenX, float screenY, ProfileDataView profileSingleView, ProfileDataView profileLeftView, ProfileDataView profileRightView, ProfileAnalyzerWindow profileAnalyzerWindow)
+        {
+            ProfileAnalyzerExportWindow window = GetWindow<ProfileAnalyzerExportWindow>("Export");
+            window.minSize = new Vector2(200, 180);
+            window.position = new Rect(screenX, screenY, 200, 180);
+            window.m_ProfileAnalyzerWindow = profileAnalyzerWindow;
+            window.SetData(profileSingleView, profileLeftView, profileRightView);
+            window.Show();
+
+            return window;
+        }
+
+        static public void CloseAll()
+        {
+            ProfileAnalyzerExportWindow window = GetWindow<ProfileAnalyzerExportWindow>("Export");
+            window.Close();
+        }
+
+        public void SetData(ProfileDataView profileDataView, ProfileDataView leftDataView, ProfileDataView rightDataView)
+        {
+            m_ProfileDataView = profileDataView;
+            m_LeftDataView = leftDataView;
+            m_RightDataView = rightDataView;
+        }
+
+        void OnGUI()
+        {
+            EditorGUILayout.BeginVertical(GUILayout.ExpandWidth(true));
+            GUILayout.Label("Export as CSV:");
+            GUILayout.Label("");
+
+            GUILayout.Label("Single View");
+
+            bool enabled = GUI.enabled;
+            if (m_ProfileDataView == null || !m_ProfileDataView.IsDataValid())
+                GUI.enabled = false;
+            if (GUILayout.Button(Styles.markerTable))
+                SaveMarkerTableCSV();
+            GUI.enabled = enabled;
+
+            if (m_ProfileDataView == null || m_ProfileDataView.analysis == null)
+                GUI.enabled = false;
+            if (GUILayout.Button(Styles.singleFrameTimes))
+                SaveFrameTimesCSV();
+            GUI.enabled = enabled;
+
+            GUILayout.Label("Comparison View");
+
+            if (!m_ProfileAnalyzerWindow.CanExportComparisonTable())
+                GUI.enabled = false;
+            if (GUILayout.Button(Styles.comparisonTables))
+                SaveComparisonTableCSV();
+            GUI.enabled = enabled;
+            if (m_LeftDataView == null || !m_LeftDataView.IsDataValid() || m_RightDataView == null || !m_RightDataView.IsDataValid())
+                GUI.enabled = false;
+            if (GUILayout.Button(Styles.comparisonFrameTimes))
+                SaveComparisonFrameTimesCSV();
+            GUI.enabled = enabled;
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void SaveMarkerTableCSV()
+        {
+            if (m_ProfileDataView.analysis == null)
+                return;
+
+            string path = EditorUtility.SaveFilePanel("Save marker table CSV data", "", "markerTable.csv", "csv");
+            if (path.Length != 0)
+            {
+                var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                using (StreamWriter file = new StreamWriter(path))
+                {
+                    file.Write("Name; ");
+                    file.Write("Median Time; Min Time; Max Time; ");
+                    file.Write("Median Frame Index; Min Frame Index; Max Frame Index; ");
+                    file.Write("Min Depth; Max Depth; ");
+                    file.Write("Total Time; ");
+                    file.Write("Mean Time; Time Lower Quartile; Time Upper Quartile; ");
+                    file.Write("Count Total; Count Median; Count Min; Count Max; ");
+                    file.Write("Number of frames containing Marker; ");
+                    file.Write("First Frame Index; ");
+                    file.Write("Time Min Individual; Time Max Individual; ");
+                    file.Write("Min Individual Frame; Max Individual Frame; ");
+                    file.WriteLine("Time at Median Frame");
+
+                    List<MarkerData> markerData = m_ProfileDataView.analysis.GetMarkers();
+                    markerData.Sort();
+                    foreach (MarkerData marker in markerData)
+                    {
+                        var markerName = marker.name;
+                        if (markerName.IndexOf('\"') >= 0)
+                            // replace all double quotation marks with single ones to avoid this breaking the escaping with double quotation marks
+                            markerName = markerName.Replace('\"', '\'');
+
+                        int medianFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(marker.medianFrameIndex, m_ProfileDataView);
+                        int minFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(marker.minFrameIndex, m_ProfileDataView);
+                        int maxFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(marker.maxFrameIndex, m_ProfileDataView);
+                        int firstFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(marker.firstFrameIndex, m_ProfileDataView);
+                        int minIndividualFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(marker.minIndividualFrameIndex, m_ProfileDataView);
+                        int maxIndividualFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(marker.maxIndividualFrameIndex, m_ProfileDataView);
+
+                        // "Escape" marker names in case it has commas in it.
+                        file.Write("\"{0}\";", markerName);
+                        file.Write(string.Format(CultureInfo.InvariantCulture,"{0};{1};{2};",
+                            marker.msMedian, marker.msMin, marker.msMax));
+                        file.Write("{0};{1};{2};",
+                            medianFrameIndex, minFrameIndex, maxFrameIndex);
+                        file.Write("{0};{1};",
+                            marker.minDepth, marker.maxDepth);
+                        file.Write(string.Format(CultureInfo.InvariantCulture, "{0};",
+                            marker.msTotal));
+                        file.Write(string.Format(CultureInfo.InvariantCulture, "{0};{1};{2};",
+                            marker.msMean, marker.msLowerQuartile, marker.msUpperQuartile));
+                        file.Write("{0};{1};{2};{3};",
+                            marker.count, marker.countMedian, marker.countMin, marker.countMax);
+                        file.Write("{0};", marker.presentOnFrameCount);
+                        file.Write("{0};", firstFrameIndex);
+                        file.Write(string.Format(CultureInfo.InvariantCulture, "{0};{1};",
+                            marker.msMinIndividual, marker.msMaxIndividual));
+                        file.Write("{0};{1};",
+                            minIndividualFrameIndex, maxIndividualFrameIndex);
+                        file.WriteLine(string.Format(CultureInfo.InvariantCulture, "{0}", marker.msAtMedian));
+                    }
+                }
+                ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.ExportSingleFrames, analytic);
+            }
+        }
+
+        void SaveFrameTimesCSV()
+        {
+            if (m_ProfileDataView == null)
+                return;
+            if (!m_ProfileDataView.IsDataValid())
+                return;
+
+            string path = EditorUtility.SaveFilePanel("Save frame time CSV data", "", "frameTime.csv", "csv");
+            if (path.Length != 0)
+            {
+                var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                using (StreamWriter file = new StreamWriter(path))
+                {
+                    file.WriteLine("Frame Offset; Frame Index; Frame Time (ms); Time from first frame (ms)");
+                    float maxFrames = m_ProfileDataView.data.GetFrameCount();
+
+                    var frame = m_ProfileDataView.data.GetFrame(0);
+                    // msStartTime isn't very accurate so we don't use it
+
+                    double msTimePassed = 0.0;
+                    for (int frameOffset = 0; frameOffset < maxFrames; frameOffset++)
+                    {
+                        frame = m_ProfileDataView.data.GetFrame(frameOffset);
+                        int frameIndex = m_ProfileDataView.data.OffsetToDisplayFrame(frameOffset);
+                        frameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(frameIndex, m_ProfileDataView);
+
+                        float msFrame = frame.msFrame;
+                        file.WriteLine(string.Format(CultureInfo.InvariantCulture, "{0};{1};{2};{3}",
+                            frameOffset, frameIndex, msFrame, msTimePassed));
+
+                        msTimePassed += msFrame;
+                    }
+                }
+                ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.ExportSingleFrames, analytic);
+            }
+        }
+
+        void SaveComparisonFrameTimesCSV()
+        {
+            if (m_LeftDataView == null || m_RightDataView == null)
+                return;
+            if (!m_LeftDataView.IsDataValid() || !m_RightDataView.IsDataValid())
+                return;
+
+            string path = EditorUtility.SaveFilePanel("Save comparison frame time CSV data", "", "frameTimeComparison.csv", "csv");
+            if (path.Length != 0)
+            {
+                var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                using (StreamWriter file = new StreamWriter(path))
+                {
+                    file.Write("Frame Offset; ");
+                    file.Write("Left Frame Index; Right Frame Index; ");
+                    file.Write("Left Frame Time (ms); Left time from first frame (ms); ");
+                    file.Write("Right Frame Time (ms); Right time from first frame (ms); ");
+                    file.WriteLine("Frame Time Diff (ms)");
+                    float maxFrames = Math.Max(m_LeftDataView.data.GetFrameCount(), m_RightDataView.data.GetFrameCount());
+
+                    var leftFrame = m_LeftDataView.data.GetFrame(0);
+                    var rightFrame = m_RightDataView.data.GetFrame(0);
+
+                    // msStartTime isn't very accurate so we don't use it
+
+                    double msTimePassedLeft = 0.0;
+                    double msTimePassedRight = 0.0;
+
+                    for (int frameOffset = 0; frameOffset < maxFrames; frameOffset++)
+                    {
+                        leftFrame = m_LeftDataView.data.GetFrame(frameOffset);
+                        rightFrame = m_RightDataView.data.GetFrame(frameOffset);
+                        int leftFrameIndex = m_LeftDataView.data.OffsetToDisplayFrame(frameOffset);
+                        leftFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(leftFrameIndex, m_LeftDataView);
+                        int rightFrameIndex = m_RightDataView.data.OffsetToDisplayFrame(frameOffset);
+                        rightFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(rightFrameIndex, m_RightDataView);
+
+                        float msFrameLeft = leftFrame != null ? leftFrame.msFrame : 0;
+                        float msFrameRight = rightFrame != null ? rightFrame.msFrame : 0;
+                        float msFrameDiff = msFrameRight - msFrameLeft;
+                        file.Write("{0};", frameOffset);
+                        file.Write("{0};{1};", leftFrameIndex, rightFrameIndex);
+                        file.Write(string.Format(CultureInfo.InvariantCulture, "{0};{1};", msFrameLeft, msTimePassedLeft));
+                        file.Write(string.Format(CultureInfo.InvariantCulture, "{0};{1};", msFrameRight, msTimePassedRight));
+                        file.WriteLine(string.Format(CultureInfo.InvariantCulture, "{0}", msFrameDiff));
+
+                        msTimePassedLeft += msFrameLeft;
+                        msTimePassedRight += msFrameRight;
+                    }
+                }
+                ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.ExportComparisonFrames, analytic);
+            }
+        }
+
+        void SaveComparisonTableCSV()
+        {
+            if (m_LeftDataView == null || m_RightDataView == null)
+                return;
+            if (!m_LeftDataView.IsDataValid() || !m_RightDataView.IsDataValid())
+                return;
+
+            string path = EditorUtility.SaveFilePanel("Save comparison table CSV data", "", "tableComparison.csv", "csv");
+            if (path.Length != 0)
+            {
+                var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                using (StreamWriter file = new StreamWriter(path))
+                {
+                    m_ProfileAnalyzerWindow.TryExportComparisonTable(file);
+                }
+                ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.ExportComparisonFrames, analytic);
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerExportWindow.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerExportWindow.cs.meta
new file mode 100644
index 0000000..48405fb
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerExportWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ccd88eea7c8284ac18aff2e257aeb84a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerShader.shader b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerShader.shader
new file mode 100644
index 0000000..185819f
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerShader.shader
@@ -0,0 +1,106 @@
+Shader "Unlit/ProfileAnalyzerShader"
+{
+    Properties
+    {
+        _StencilComp ("Stencil Comparison", Float) = 8
+        _Stencil ("Stencil ID", Float) = 0
+        _StencilOp ("Stencil Operation", Float) = 0
+        _StencilWriteMask ("Stencil Write Mask", Float) = 255
+        _StencilReadMask ("Stencil Read Mask", Float) = 255
+
+        _ColorMask ("Color Mask", Float) = 15
+
+        [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0
+
+        _ClipRect ("Clip Rect", vector) = (-32767, -32767, 32767, 32767)
+    }
+
+    SubShader
+    {
+        Tags
+        {
+            "Queue"="Transparent"
+            "IgnoreProjector"="True"
+            "RenderType"="Transparent"
+            "PreviewType"="Plane"
+            "CanUseSpriteAtlas"="True"
+        }
+
+        Stencil
+        {
+            Ref [_Stencil]
+            Comp [_StencilComp]
+            Pass [_StencilOp]
+            ReadMask [_StencilReadMask]
+            WriteMask [_StencilWriteMask]
+        }
+
+        //Tags { "RenderType"="Transparent" }
+        LOD 100
+
+        //ZWrite Off
+        //Blend SrcAlpha OneMinusSrcAlpha
+
+        Cull Off
+        Lighting Off
+        ZWrite Off
+        ZTest [unity_GUIZTestMode]
+        Blend SrcAlpha OneMinusSrcAlpha
+        ColorMask [_ColorMask]
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+
+            #include "UnityCG.cginc"
+            #include "UnityUI.cginc"
+
+            #pragma multi_compile _ UNITY_UI_ALPHACLIP
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                fixed4 color : COLOR;
+            };
+
+            struct v2f
+            {
+                float4 vertex : SV_POSITION;
+                fixed4 color : COLOR;
+                float4 worldPosition : TEXCOORD1;
+            };
+
+            bool _UseClipRect;
+            float4 _ClipRect;
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.worldPosition = v.vertex;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.color.rgba = v.color;
+                return o;
+            }
+
+            //fixed4 frag (v2f i) : SV_Target { return i.color; }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                half4 color = i.color;
+
+                if (_UseClipRect)
+                    color.a *= UnityGet2DClipping(i.worldPosition.xy, _ClipRect);
+
+                #ifdef UNITY_UI_ALPHACLIP
+                clip (color.a - 0.001);
+                #endif
+
+                return color;
+            }
+
+            ENDCG
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerShader.shader.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerShader.shader.meta
new file mode 100644
index 0000000..53a2c5d
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerShader.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 493b79ea9c9be44ed8b702014d3ac49c
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerWindow.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerWindow.cs
new file mode 100644
index 0000000..25dc398
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerWindow.cs
@@ -0,0 +1,5917 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using UnityEditor.IMGUI.Controls;
+using UnityEditorInternal;
+using UnityEngine;
+using UnityEngine.Profiling;
+using Debug = UnityEngine.Debug;
+using ProfilerCommon = UnityEditorInternal.ProfilerDriver;
+using ProfilerMarkerAbstracted = Unity.Profiling.ProfilerMarker;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    enum ThreadRange
+    {
+        Median,
+        UpperQuartile,
+        Max
+    };
+
+    enum ActiveTab
+    {
+        Summary,
+        Compare,
+    };
+
+    enum ActiveView
+    {
+        Single,
+        Left,
+        Right
+    }
+
+    enum ThreadActivity
+    {
+        None,
+        Analyze,
+        AnalyzeDone,
+        Compare,
+        CompareDone,
+        Load,
+        LoadDone
+    };
+
+    enum TopTenDisplay
+    {
+        Normalized,
+        LongestTime,
+    };
+
+    enum NameFilterOperation
+    {
+        All,    // AND
+        Any,    // OR
+    };
+
+    enum RemoveMarkerOperation
+    {
+        ShowAll,
+        HideWaitForFPS,
+        HideWaitForPresent,
+        Custom,
+    };
+
+    /// <summary>
+    /// Main profile Analyzer UI window
+    /// </summary>
+    public class ProfileAnalyzerWindow : EditorWindow
+    {
+        internal static class Styles
+        {
+            public static readonly GUIContent emptyString = new GUIContent("", "");
+            public static readonly GUIContent dash = new GUIContent("-", "");
+            public static readonly GUIContent thread = new GUIContent("Thread", "");
+            public static readonly GUIContent noThread = new GUIContent("", "Thread not present on this data set");
+
+            public static readonly GUIContent max = new GUIContent("Max", "The peak value in the data set");
+            public static readonly GUIContent upperQuartile = new GUIContent("Upper Quartile", "The middle value between the median and the highest value of the data set. I.e. at 75% of the ordered data.");
+            public static readonly GUIContent mean = new GUIContent("Mean", "The average value in the data set");
+            public static readonly GUIContent median = new GUIContent("Median", "The central value in the data set");
+            public static readonly GUIContent lowerQuartile = new GUIContent("Lower Quartile", "The middle number between the smallest number and the median of the data set. I.e. at 25% of the ordered data.");
+            public static readonly GUIContent min = new GUIContent("Min", "The minimum value in the data set");
+            public static readonly GUIContent individualMin = new GUIContent("Individual Min", "The minimum value in the data set for an individual marker instance (not the total in the frame)");
+            public static readonly GUIContent individualMax = new GUIContent("Individual Max", "The maximum value in the data set for an individual marker instance (not the total in the frame)");
+
+            public static readonly GUIContent export = new GUIContent("Export", "Export profiler data as CSV files");
+            public static readonly GUIContent pullOpen = new GUIContent("Pull Data", "Pull data from Unity profiler.\nFirst you must open Unity profiler to pull data from it");
+            public static readonly GUIContent pullRange = new GUIContent("Pull Data", "Pull data from Unity profiler.\nFirst you must use the Unity profiler to capture data from application");
+            public static readonly GUIContent pullRecording = new GUIContent("Pull Data", "Pull data from Unity profiler.\nStop Unity profiler recording to enable pulling data");
+            public static readonly GUIContent pull = new GUIContent("Pull Data", "Pull data from Unity profiler");
+            public static readonly GUIContent nameFilter = new GUIContent("Name Filter : ", "Only show markers containing the strings\n\n(Effects the marker table below)");
+            public static readonly GUIContent nameExclude = new GUIContent("Exclude Names : ", "Excludes markers containing the strings\n\n(Effects the marker table below)");
+            public static readonly GUIContent threadFilter = new GUIContent("Thread : ", "Select threads to focus on\n\n(Effects the marker table below)");
+            public static readonly GUIContent threadFilterSelect = new GUIContent("Select", "Select threads to focus on\n\n(Effects the marker table below)");
+            public static readonly GUIContent unitFilter = new GUIContent("Units : ", "Units to show in UI");
+            public static readonly GUIContent timingFilter = new GUIContent("Analysis Type : ", TimingOptions.Tooltip);
+            public static readonly GUIContent markerColumns = new GUIContent("Marker Columns : ", "Set of Columns to show in the table");
+            public static readonly GUIContent graphPairing = new GUIContent("Pair Graph Selection", "Selections on one graph will affect the other");
+            public static readonly GUIContent removeMarker = new GUIContent("Remove : ", "Remove a specific marker from time analysis\n\n(Effects all views)");
+            public static readonly GUIContent hideRemoveMarkers = new GUIContent("Hide Removed Markers", "Hide removed markers from the marker table");
+
+            public static readonly GUIContent frameSummary = new GUIContent("Frame Summary", "");
+            public static readonly GUIContent frameCount = new GUIContent("Frame Count", "Frame Count");
+            public static readonly GUIContent frameStart = new GUIContent("Start", "Frame Start");
+            public static readonly GUIContent frameEnd = new GUIContent("End", "Frame End");
+            public static readonly GUIContent threadSummary = new GUIContent("Thread Summary", "");
+            public static readonly GUIContent threadGraphScale = new GUIContent("Graph Scale : ", "");
+            public static readonly GUIContent[] threadRanges =
+            {
+                new GUIContent("Median", "Median frame time"),
+                new GUIContent("Upper quartile", "Upper quartile of frame time"),
+                new GUIContent("Max", "Max frame time")
+            };
+
+            public static readonly GUIContent markerSummary = new GUIContent("Marker Summary", "");
+            public static readonly GUIContent filters = new GUIContent("Filters", "");
+            public static readonly GUIContent profileTable = new GUIContent("Marker Details for currently selected range", "");
+            public static readonly GUIContent comparisonTable = new GUIContent("Marker Comparison for currently selected range", "");
+
+            public static readonly GUIContent depthTitle = new GUIContent("Depth Slice : ", "Marker callstack depth to analyze");
+            public static readonly GUIContent leftDepthTitle = new GUIContent("Left : ", "Marker callstack depth to analyze");
+            public static readonly GUIContent rightDepthTitle = new GUIContent("Right : ", "Marker callstack depth to analyze");
+            public static readonly string autoDepthTitleText = "Auto Depth (Diff: {0:+##;-##;None})";
+            public static readonly GUIContent autoDepthTitle = new GUIContent("Auto Depth", "Match up the depth levels based on the most common difference between markers present in both data sets. If the selected depth is at a depth not present in the other data set, after applying this difference, it will use the deepest level.");
+            public static readonly GUIContent parentMarker = new GUIContent("Parent Marker : ", "Marker to start analysis from.\nParent of the hierarchy to analyze.");
+            public static readonly GUIContent selectParentMarker = new GUIContent("None", "Select using right click context menu on marker names in marker table");
+
+            public static readonly GUIContent topMarkerRatio = new GUIContent("Ratio : ", "Normalize\tNormalized to time of the individual set\nLongest\tRatio based on longest time of the two");
+
+            public static readonly GUIContent firstFrame = new GUIContent("First frame", "");
+
+            public static readonly GUIContent[] topTenDisplayOptions =
+            {
+                new GUIContent("Normalized", "Ratio normalized to time of the individual data set"),
+                new GUIContent("Longest", "Ratio based on longest time of the two data sets")
+            };
+
+            public static readonly GUIContent[] nameFilterOperation =
+            {
+                new GUIContent("All", "Marker name contains all strings"),
+                new GUIContent("Any", "Marker name contains any of the strings")
+            };
+
+            public static readonly GUIContent[] removeMarkerOperation =
+            {
+                new GUIContent("None", "All markers shown. None removed."),
+                new GUIContent("FPS Wait", "Remove the WaitForTargetFPS marker which represents targeted FPS (*) time\n\n(*) Via Application.targetFrameRate API usage (common on Mobile)"),
+                new GUIContent("Present Wait", "Remove the Gfx.WaitForPresentOnGfxThread marker which represents time waiting for GPU to complete (common on consoles)"),
+                new GUIContent("Custom", "Right click on a marker in the table and select 'Remove Marker' to remove a specific marker (and all children too)")
+            };
+
+            public static readonly GUIContent menuItemSelectFramesInAll = new GUIContent("Select Frames that contain this marker (within whole data set)", "");
+            public static readonly GUIContent menuItemSelectFramesInCurrent = new GUIContent("Select Frames that contain this marker (within current selection)", "");
+            public static readonly GUIContent menuItemSelectFramesAll = new GUIContent("Clear Selection", "");
+
+            public static readonly GUIContent frameCosts = new GUIContent(" by frame costs", "Contains accumulated marker cost within the frame");
+            public static readonly GUIContent dataMissing = new GUIContent("Pull or load a data set for analysis", "Pull data from Unity Profiler or load a previously saved analysis data set");
+            public static readonly GUIContent comparisonDataMissing = new GUIContent("Pull or load a data set for comparison", "Pull data from Unity Profiler or load previously saved analysis data sets");
+
+            public static readonly string topMarkersTooltip = "Top markers for the median frame.\nThe length of this frame is the median of those in the data set.\nIt is likely to be the most representative frame.";
+            public static readonly string medianFrameTooltip = "The length of this frame is the median of those in the data set.\nIt is likely to be the most representative frame.";
+
+            public static readonly string helpText =
+@"This tool can analyze Unity Profiler data, to find representative frames and perform comparisons of data sets.
+
+To gather data to analyze:
+* Open the Unity Profiler. Either via the Unity menu under 'Windows', 'Analysis' or via the 'Open Profile Window' in the tool bar.
+* Capture some profiling data in the Unity Profiler by selecting a target application and click the 'Record' button.
+* Stop the capture by clicking again on the 'Record' button.
+
+To analyze the data:
+* Pull the Unity Profiler data into this tool by clicking the 'Pull Data' button in the single or compare views.
+* The analysis will be automatically triggered (in the compare view two data sets are required before analysis is performed).
+* Select a marker to see more detailed information about its time utilization over the frame time range.
+* Save off a data file from here to keep for future use. (Recommend saving the profile .data file in the same folder).
+
+To compare two data sets:
+* Click the compare tab. The data in the single tab will be used by default. You can also load previously saved analysis data.
+* Drag select a region in the frame time graph (above) to choose 1 or more frames for each of the two data sets.
+* The comparison will be automatically triggered as the selection is made.";
+        }
+
+        const float k_ProgressBarHeight = 2f;
+
+        ProgressBarDisplay m_ProgressBar;
+        ProfileAnalyzer m_ProfileAnalyzer;
+
+        ProfilerWindowInterface m_ProfilerWindowInterface;
+        string m_LastProfilerSelectedMarker;
+
+        string m_LastMarkerSuccesfullySyncedWithProfilerWindow = null;
+
+        [NonSerialized] bool m_SelectionEventFromProfilerWindowInProgress = false;
+
+        int m_TopNumber;
+        string[] m_TopStrings;
+        int[] m_TopValues;
+
+        [SerializeField] DepthSliceUI m_DepthSliceUI;
+
+        [SerializeField]
+        TimingOptions.TimingOption m_TimingOption = TimingOptions.TimingOption.Time;
+
+        [SerializeField]
+        string m_ParentMarker = null;
+
+        List<string> m_ThreadUINames = new List<string>();
+        List<string> m_ThreadNames = new List<string>();
+        Dictionary<string, string> m_ThreadNameToUIName;
+        GUIContent[] m_removeMarkerDisplay = null;
+        int[] m_removeMarkerValues = null;
+        bool m_removeMarkerSomeMissing = false;
+
+        struct MarkerFilter
+        {
+            public Dictionary<string, bool> MarkerCache;
+            public bool NeedsRebuild;
+            public List<string> IncludeFilter;
+            public List<string> ExcludeFilter;
+            public NameFilterOperation IncludeOperation;
+            public NameFilterOperation ExcludeOperation;
+
+            public void Clear()
+            {
+                MarkerCache.Clear();
+                NeedsRebuild = true;
+            }
+
+            private void Rebuild(ProfileAnalyzerWindow window)
+            {
+                NeedsRebuild = false;
+                IncludeFilter = window.GetNameFilters();
+                ExcludeFilter = window.GetNameExcludes();
+                IncludeOperation = window.m_NameFilterOperation;
+                ExcludeOperation = window.m_NameExcludeOperation;
+            }
+
+            private bool ComputeFilter(string marker)
+            {
+                if (IncludeFilter.Count > 0)
+                {
+                    if (!NameInFilterList(marker, IncludeFilter, IncludeOperation))
+                        return false;
+                }
+                if (ExcludeFilter.Count > 0)
+                {
+                    if (NameInFilterList(marker, ExcludeFilter, ExcludeOperation))
+                        return false;
+                }
+                return true;
+            }
+
+            public bool DoesMarkerPassFilter(ProfileAnalyzerWindow window, string marker)
+            {
+                if (NeedsRebuild)
+                    Rebuild(window);
+
+                if (MarkerCache.TryGetValue(marker, out var value))
+                    return value;
+                bool passesFilter = ComputeFilter(marker);
+                MarkerCache[marker] = passesFilter;
+                return passesFilter;
+            }
+        }
+        MarkerFilter m_MarkerFilter;
+
+        [SerializeField]
+        ThreadSelection m_ThreadSelection = new ThreadSelection();
+        ThreadSelection m_ThreadSelectionNew;
+        string m_ThreadSelectionSummary;
+
+        [SerializeField]
+        DisplayUnits m_DisplayUnits = new DisplayUnits(Units.Milliseconds);
+        string[] m_UnitNames;
+
+        [SerializeField]
+        string m_NameFilter = "";
+        [SerializeField]
+        string m_NameExclude = "";
+
+        [SerializeField]
+        MarkerColumnFilter m_SingleModeFilter = new MarkerColumnFilter(MarkerColumnFilter.Mode.TimeAndCount);
+        [SerializeField]
+        MarkerColumnFilter m_CompareModeFilter = new MarkerColumnFilter(MarkerColumnFilter.Mode.TimeAndCount);
+
+        [SerializeField]
+        TopTenDisplay m_TopTenDisplay = TopTenDisplay.Normalized;
+        [SerializeField]
+        NameFilterOperation m_NameFilterOperation = NameFilterOperation.All;
+        [SerializeField]
+        NameFilterOperation m_NameExcludeOperation = NameFilterOperation.Any;
+        [SerializeField]
+        RemoveMarkerOperation m_removeMarkerOperation = RemoveMarkerOperation.ShowAll;
+        [SerializeField]
+        bool m_hideRemovedMarkers = true;
+
+        int m_ProfilerFirstFrameIndex = 0;
+        int m_ProfilerLastFrameIndex = 0;
+        const int k_ProfileDataDefaultDisplayOffset = 1;
+
+        ActiveTab m_NextActiveTab = ActiveTab.Summary;
+        ActiveTab m_ActiveTab = ActiveTab.Summary;
+        bool m_OtherTabDirty = false;
+        bool m_OtherTableDirty = false;
+
+        [SerializeField]
+        string m_removeMarkerCustomRemoveMarker = null;
+
+        [SerializeField]
+        bool m_ShowFilters = true;
+        [SerializeField]
+        bool m_ShowTopNMarkers = true;
+        [SerializeField]
+        bool m_ShowFrameSummary = true;
+        [SerializeField]
+        bool m_ShowThreadSummary = false;
+        [SerializeField]
+        bool m_ShowMarkerSummary = true;
+        [SerializeField]
+        bool m_ShowMarkerTable = true;
+
+        internal static class UIColor
+        {
+            static internal Color Color256(int r, int g, int b, int a)
+            {
+                return new Color((float)r / 255.0f, (float)g / 255.0f, (float)b / 255.0f, (float)a / 255.0f);
+            }
+
+            public static readonly Color white = new UnityEngine.Color(1.0f, 1.0f, 1.0f);
+            public static readonly Color barBackground = new Color(0.5f, 0.5f, 0.5f);
+            public static readonly Color barBackgroundSelected = new Color(0.6f, 0.6f, 0.6f);
+            public static readonly Color boxAndWhiskerBoxColor = Color256(112, 112, 112, 255);
+            public static readonly Color boxAndWhiskerLineColorLeft = Color256(206, 219, 238, 255);
+            public static readonly Color boxAndWhiskerBoxColorLeft = Color256(59, 104, 144, 255);
+            public static readonly Color boxAndWhiskerLineColorRight = Color256(247, 212, 201, 255);
+            public static readonly Color boxAndWhiskerBoxColorRight = Color256(161, 83, 30, 255);
+            public static readonly Color bar = new Color(0.95f, 0.95f, 0.95f);
+            public static readonly Color barSelected = new Color(0.5f, 1.0f, 0.5f);
+            public static readonly Color standardLine = new Color(1.0f, 1.0f, 1.0f);
+            public static readonly Color gridLines = new Color(0.4f, 0.4f, 0.4f);
+
+            public static readonly Color left = Color256(111, 163, 216, 255);
+            public static readonly Color leftSelected = Color256(06, 219, 238, 255);
+            public static readonly Color right = Color256(238, 134, 84, 255);
+            public static readonly Color rightSelected = Color256(247, 212, 201, 255);
+            public static readonly Color both = Color256(175, 150, 150, 255);
+            public static readonly Color textTopMarkers = Color256(0, 0, 0, 255);
+            public static readonly Color marker = new Color(0.0f, 0.5f, 0.5f);
+            public static readonly Color markerSelected = new Color(0.0f, 0.6f, 0.6f);
+            public static readonly Color thread = new Color(0.5f, 0.0f, 0.5f);
+            public static readonly Color threadSelected = new Color(0.6f, 0.0f, 0.6f);
+        }
+
+        [SerializeField]
+        ProfileDataView m_ProfileSingleView;
+        [SerializeField]
+        ProfileDataView m_ProfileLeftView;
+        [SerializeField]
+        ProfileDataView m_ProfileRightView;
+
+        [SerializeField] ThreadMarkerInfo m_SelectedMarker = new ThreadMarkerInfo();
+
+        [Serializable]
+        struct ThreadMarkerInfo
+        {
+            [SerializeField]
+            public int id;
+
+            [SerializeField]
+            public string threadName;
+            [SerializeField]
+            public string threadGroupName;
+            [SerializeField]
+            public string name;
+        }
+
+        FrameTimeGraphGlobalSettings m_FrameTimeGraphGlobalSettings;
+        FrameTimeGraph m_FrameTimeGraph;
+        FrameTimeGraph m_LeftFrameTimeGraph;
+        FrameTimeGraph m_RightFrameTimeGraph;
+        bool m_FrameTimeGraphsPaired = true;
+
+        TopMarkers m_TopMarkers;
+        TopMarkers m_TopMarkersLeft;
+        TopMarkers m_TopMarkersRight;
+
+
+        List<MarkerPairing> m_PairingsNew;
+        int m_TotalCombinedMarkerCountNew;
+
+        [SerializeField]
+        List<MarkerPairing> m_Pairings = new List<MarkerPairing>();
+        int m_TotalCombinedMarkerCount = 0;
+
+        [SerializeField]
+        int m_SelectedPairing = 0;
+
+        [SerializeField]
+        TreeViewState m_ProfileTreeViewState;
+        [SerializeField]
+        MultiColumnHeaderState m_ProfileMulticolumnHeaderState;
+        ProfileTable m_ProfileTable;
+
+        [SerializeField]
+        TreeViewState m_ComparisonTreeViewState;
+        [SerializeField]
+        MultiColumnHeaderState m_ComparisonMulticolumnHeaderState;
+        ComparisonTable m_ComparisonTable;
+
+        internal static class LayoutSize
+        {
+            public static readonly int WidthColumn0 = 100;
+            public static readonly int WidthColumn1 = 52;       // +2 to prevent some
+            public static readonly int WidthColumn2 = 52;
+            public static readonly int WidthColumn3 = 52;
+            public static readonly int WidthRHS = 290;        // Column widths + label padding between (276) + scrollbar width
+            public static readonly int FilterOptionsLeftLabelWidth = 100;
+            public static readonly int FilterOptionsEnumWidth = 50;
+            public static readonly int RemoveMarkerOptionsEnumWidth = 100;
+            public static readonly int RemoveMarkerMissingOptionsEnumWidth = 200;
+            public static readonly int FilterOptionsLockedEnumWidth = 120;
+            public static readonly int FilterOptionsRightLabelWidth = 110;
+            public static readonly int FilterOptionsRightEnumWidth = 150;
+            public static readonly int HistogramWidth = 153;
+
+            public static readonly int MinWindowWidth = 800 + WidthRHS;
+            public static readonly int MinWindowHeight = 480;
+
+            public static readonly int WindowWidth = MinWindowWidth;
+            public static readonly int WindowHeight = 840;
+            public static readonly int ScrollBarPadding = 6; // this is legacy and we might be able to kill it but it will slightly change the layout of the window.
+        }
+
+        Columns m_Columns = new Columns(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+
+        [SerializeField]
+        ThreadRange m_ThreadRange = ThreadRange.UpperQuartile;
+
+        internal Draw2D m_2D;
+
+        bool m_Async = true;
+        Thread m_BackgroundThread;
+        ThreadActivity m_ThreadActivity;
+        ProfileData m_ProfilerData;
+        string m_Path;
+        int m_ThreadPhase;
+        int m_ThreadPhases;
+        int m_ThreadProgress;
+
+        bool m_RequestRepaint;
+        bool m_RequestAnalysis;
+        bool m_RequestCompare;
+        bool m_FullAnalysisRequired;
+        bool m_FullCompareRequired;
+
+        [SerializeField]
+        int m_TopNBars = 10;
+
+        bool m_EnableAnalysisProfiling = false;
+        int m_AnalyzeInUpdatePhase = 0;
+
+        string m_LastAnalysisTime = "";
+        string m_LastCompareTime = "";
+        float m_LastAnalysisTimeMilliseconds;
+        float m_LastCompareTimeMilliseconds;
+        bool m_NewDataLoaded = false;
+        bool m_NewComparisonDataLoaded = false;
+
+        Vector2 m_HelpScroll = new Vector2(0, 0);
+        Vector2 m_ThreadScroll = new Vector2(0, 0);
+        Vector2 m_MarkerSummaryScroll = new Vector2(0, 0);
+
+        Rect m_ThreadsAreaRect = new Rect();
+        Rect m_ComparisonThreadsAreaRect = new Rect();
+
+        Vector2 m_LastScreenSize = new Vector2(0, 0);
+        bool m_ScreenSizeChanged;
+        double m_ScreenSizeChangedTimeStarted;
+        double m_ScreenSizeChangedTimeFinished;
+        ActiveTab m_ScreenSizeChangedTab;
+
+        GUIStyle m_StyleMiddleRight;
+        GUIStyle m_StyleUpperLeft;
+        bool m_StylesSetup = false;
+
+        static Regex quotedStringWithoutQuotes = new Regex("\"([^\"]*)\"");
+        static Regex quotedString = new Regex("(\"[^\"]*\")");
+        static Regex stringWithoutWhiteSpace = new Regex("([^ \t]+)");
+        /*
+                static Regex lastSpace = new Regex("(.+)[ ]([^ ]*)");
+        */
+
+        [MenuItem("Window/Analysis/Profile Analyzer")]
+        static void Init()
+        {
+            var window = GetWindow<ProfileAnalyzerWindow>("Profile Analyzer");
+            window.minSize = new Vector2(LayoutSize.MinWindowWidth, LayoutSize.MinWindowHeight);
+            window.position.size.Set(LayoutSize.WindowWidth, LayoutSize.WindowHeight);
+            window.Show();
+            window.m_LastScreenSize = window.position.size;
+        }
+
+        /// <summary>
+        /// Open profile analyzer window
+        /// </summary>
+        public static void OpenProfileAnalyzer()
+        {
+            Init();
+        }
+
+        void Awake()
+        {
+            m_ScreenSizeChanged = false;
+            m_ScreenSizeChangedTimeStarted = 0.0;
+            m_ScreenSizeChangedTimeFinished = 0.0;
+            m_ScreenSizeChangedTab = ActiveTab.Summary;
+
+            m_ProfileSingleView = new ProfileDataView();
+            m_ProfileLeftView = new ProfileDataView();
+            m_ProfileRightView = new ProfileDataView();
+
+            m_RequestRepaint = false;
+            m_RequestAnalysis = false;
+            m_RequestCompare = false;
+
+            m_FrameTimeGraphGlobalSettings = new FrameTimeGraphGlobalSettings();
+        }
+
+        static int s_TmpCount = 0;
+        static string s_TmpDir = "";
+        ActiveView m_ActiveLoadingView;
+        static string s_ApplicationDataPath;
+
+        internal static string TmpDir
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(s_ApplicationDataPath))
+                    s_ApplicationDataPath = Application.dataPath;
+                if (string.IsNullOrEmpty(s_TmpDir))
+                    s_TmpDir = string.Format("{0}{1}ProfileAnalyzer{1}", Directory.GetParent(s_ApplicationDataPath).FullName, Path.DirectorySeparatorChar);
+
+                return s_TmpDir;
+            }
+        }
+
+
+        internal static string TmpPath
+        {
+            get
+            {
+                if (!Directory.Exists(TmpDir))
+                    Directory.CreateDirectory(TmpDir);
+
+                while (File.Exists(string.Format("{0}tmp{1}.pdata", TmpDir, s_TmpCount)))
+                {
+                    s_TmpCount++;
+                }
+                return string.Format("{0}tmp{1}.pdata", TmpDir, s_TmpCount);
+            }
+        }
+
+        void OnEnable()
+        {
+            //do this here to safeguard against Application.dataPAth being accessed off the main thread
+            s_ApplicationDataPath = Application.dataPath;
+
+            // Update styles so we get the theme changes
+            m_StylesSetup = false;
+
+            ProfileAnalyzerAnalytics.EnableAnalytics();
+
+            m_ProgressBar = new ProgressBarDisplay();
+
+            if (m_DepthSliceUI == null)
+                m_DepthSliceUI = new DepthSliceUI(b => UpdateActiveTab(b));
+            else
+                m_DepthSliceUI.OnEnable(b => UpdateActiveTab(b));
+
+            m_ProfilerWindowInterface = new ProfilerWindowInterface(m_ProgressBar);
+            if (!m_ProfilerWindowInterface.IsReady())
+            {
+                m_ProfilerWindowInterface.GetProfilerWindowHandle();
+            }
+
+            if (IsSelectedMarkerNameValid())
+            {
+                var oldSelectedMarkerName = m_SelectedMarker;
+                m_SelectedMarker.name = null;
+                // wait a frame for the ProfilerWindow to get Enabled before re-setting the selection
+                EditorApplication.delayCall += () => SelectMarkerByName(oldSelectedMarkerName.name, oldSelectedMarkerName.threadGroupName, oldSelectedMarkerName.threadName);
+            }
+            m_ProfilerWindowInterface.selectedMarkerChanged -= OnProfilerWindowCpuModuleSelectionChanged;
+            m_ProfilerWindowInterface.selectedMarkerChanged += OnProfilerWindowCpuModuleSelectionChanged;
+
+            m_ProfilerWindowInterface.selectedFrameChanged -= OnProfilerWindowSelectedFrameChanged;
+            m_ProfilerWindowInterface.selectedFrameChanged += OnProfilerWindowSelectedFrameChanged;
+            m_MarkerFilter = new MarkerFilter
+            {
+                MarkerCache = new Dictionary<string, bool>(),
+                NeedsRebuild = true,
+            };
+
+            m_ProfileAnalyzer = new ProfileAnalyzer();
+
+            if (m_ThreadSelection == null || m_ThreadSelection.empty)
+            {
+                ThreadIdentifier mainThreadSelection = new ThreadIdentifier("Main Thread", 1);
+                m_ThreadSelection.Set(mainThreadSelection.threadNameWithIndex);
+            }
+
+            if (m_ThreadSelectionNew != null && m_ThreadSelectionNew.empty)
+                m_ThreadSelectionNew = null;
+
+            m_2D = new Draw2D("Unlit/ProfileAnalyzerShader");
+            FrameTimeGraph.SetGlobalSettings(m_FrameTimeGraphGlobalSettings);
+            m_FrameTimeGraph = new FrameTimeGraph(0, m_2D, m_DisplayUnits.Units, UIColor.barBackground, UIColor.barBackgroundSelected, UIColor.bar, UIColor.barSelected, UIColor.marker, UIColor.markerSelected, UIColor.thread, UIColor.threadSelected, UIColor.gridLines);
+            m_FrameTimeGraph.SetRangeCallback(SetRange);
+            m_FrameTimeGraph.SetActiveCallback(GraphActive);
+            m_LeftFrameTimeGraph = new FrameTimeGraph(1, m_2D, m_DisplayUnits.Units, UIColor.barBackground, UIColor.barBackgroundSelected, UIColor.left, UIColor.leftSelected, UIColor.marker, UIColor.markerSelected, UIColor.thread, UIColor.threadSelected, UIColor.gridLines);
+            m_LeftFrameTimeGraph.SetRangeCallback(SetLeftRange);
+            m_LeftFrameTimeGraph.SetActiveCallback(GraphActive);
+            m_RightFrameTimeGraph = new FrameTimeGraph(2, m_2D, m_DisplayUnits.Units, UIColor.barBackground, UIColor.barBackgroundSelected, UIColor.right, UIColor.rightSelected, UIColor.marker, UIColor.markerSelected, UIColor.thread, UIColor.threadSelected, UIColor.gridLines);
+            m_RightFrameTimeGraph.SetRangeCallback(SetRightRange);
+            m_RightFrameTimeGraph.SetActiveCallback(GraphActive);
+            m_LeftFrameTimeGraph.PairWith(m_FrameTimeGraphsPaired ? m_RightFrameTimeGraph : null);
+
+            m_TopMarkers = new TopMarkers(this, m_2D, UIColor.barBackground, UIColor.textTopMarkers);
+            m_TopMarkersLeft = new TopMarkers(this, m_2D, UIColor.barBackground, UIColor.textTopMarkers);
+            m_TopMarkersRight = new TopMarkers(this, m_2D, UIColor.barBackground, UIColor.textTopMarkers);
+
+            m_ThreadActivity = ThreadActivity.None;
+            m_ThreadProgress = 0;
+            m_ThreadPhase = 0;
+
+            List<int> values = new List<int>();
+            List<String> strings = new List<string>();
+            for (int i = 1; i <= 10; i++)
+            {
+                values.Add(i);
+                strings.Add(i.ToString());
+            }
+            m_TopValues = values.ToArray();
+            m_TopStrings = strings.ToArray();
+            m_TopNumber = 3;
+
+            List<string> unitNames = new List<string>(DisplayUnits.UnitNames);
+            unitNames.RemoveAt(unitNames.Count - 1);
+            m_UnitNames = unitNames.ToArray();
+
+            // Regrenerate analysis if just re initialised with the existing profile data reloaded from serialisation (e.g. on enter play mode)
+            // As we don't serialise the analysis itself.
+            // UpdateActiveTab(true);
+
+            UpdateThreadNames();
+
+            if (m_ProfileSingleView.analysis != null)
+            {
+                CreateProfileTable();
+                m_RequestRepaint = true;
+            }
+
+            if (m_ProfileLeftView.analysis != null && m_ProfileRightView.analysis != null)
+            {
+                CreateComparisonTable();
+                m_RequestRepaint = true;
+            }
+
+            // Mouse movement calls OnGui
+            wantsMouseMove = true;
+        }
+
+        void OnDisable()
+        {
+            if (ProfileAnalyzerExportWindow.IsOpen())
+                ProfileAnalyzerExportWindow.CloseAll();
+            m_ProfilerWindowInterface.selectedMarkerChanged -= OnProfilerWindowCpuModuleSelectionChanged;
+            m_ProfilerWindowInterface.selectedFrameChanged -= OnProfilerWindowSelectedFrameChanged;
+            m_ProfilerWindowInterface.OnDisable();
+            m_ProfilerWindowInterface = null;
+        }
+
+        void OnDestroy()
+        {
+            if (m_BackgroundThread != null)
+                m_BackgroundThread.Abort();
+            if (m_ProfileSingleView != null && m_ProfileSingleView.data != null)
+                m_ProfileSingleView.data.DeleteTmpFiles();
+            if (m_ProfileLeftView != null && m_ProfileLeftView.data != null)
+                m_ProfileLeftView.data.DeleteTmpFiles();
+            if (m_ProfileRightView != null && m_ProfileRightView.data != null)
+                m_ProfileRightView.data.DeleteTmpFiles();
+            if (Directory.Exists(TmpDir) && Directory.GetFiles(TmpDir).Length == 0)
+                Directory.Delete(TmpDir, true);
+        }
+
+        bool DisplayCount()
+        {
+            switch (m_SingleModeFilter.mode)
+            {
+                case MarkerColumnFilter.Mode.CountTotals:
+                case MarkerColumnFilter.Mode.CountPerFrame:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        void OnGUI()
+        {
+            if (Event.current.type != EventType.MouseMove)
+            {
+                m_2D.OnGUI();
+
+                Draw();
+            }
+
+            ProcessInput();
+        }
+
+        bool TmpInUse(ProfileDataView dv, string path)
+        {
+            if (dv != m_ProfileSingleView && m_ProfileSingleView.data != null && m_ProfileSingleView.data.FilePath == path)
+                return true;
+
+            if (dv != m_ProfileLeftView && m_ProfileLeftView.data != null && m_ProfileLeftView.data.FilePath == path)
+                return true;
+
+            if (dv != m_ProfileRightView && m_ProfileRightView.data != null && m_ProfileRightView.data.FilePath == path)
+                return true;
+
+            return false;
+        }
+
+        void SetView(ProfileDataView dst, ProfileData data, string path, FrameTimeGraph graph)
+        {
+            if (!data.IsSame(dst.data))
+            {
+                if (dst == m_ProfileSingleView)
+                    m_NewDataLoaded = true;
+                else
+                    m_NewComparisonDataLoaded = true;
+            }
+
+            if (dst.data != null && (m_NewDataLoaded || m_NewComparisonDataLoaded) && !TmpInUse(dst, dst.data.FilePath))
+                dst.data.DeleteTmpFiles();
+
+            dst.data = data;
+            dst.path = path;
+            dst.SelectFullRange();
+
+            graph.Reset();
+            graph.SetData(GetFrameTimeData(dst.data));
+
+            // One of the views changed so make sure the export window knows if its open
+            ProfileAnalyzerExportWindow exportWindow = ProfileAnalyzerExportWindow.FindOpenWindow();
+            if (exportWindow != null)
+            {
+                exportWindow.SetData(m_ProfileSingleView, m_ProfileLeftView, m_ProfileRightView);
+            }
+        }
+
+        void SetView(ProfileDataView dst, ProfileDataView src, FrameTimeGraph graph)
+        {
+            SetView(dst, src.data, src.path, graph);
+        }
+
+        void UpdateThreadNames()
+        {
+            // Update threads list
+            switch (m_ActiveTab)
+            {
+                case ActiveTab.Summary:
+                    GetThreadNames(m_ProfileSingleView.data, out m_ThreadUINames, out m_ThreadNames, out m_ThreadNameToUIName);
+                    break;
+                case ActiveTab.Compare:
+                    GetThreadNames(m_ProfileLeftView.data, m_ProfileRightView.data, out m_ThreadUINames, out m_ThreadNames, out m_ThreadNameToUIName);
+                    break;
+            }
+
+            UpdateThreadGroupSelection(m_ThreadNames, m_ThreadSelection);
+            m_ThreadSelectionSummary = CalculateSelectedThreadsSummary();
+        }
+
+        void ProcessTabSwitch()
+        {
+            if (m_NextActiveTab != m_ActiveTab)
+            {
+                m_ActiveTab = m_NextActiveTab;
+
+                // Copy data if none present for this tab
+                switch (m_ActiveTab)
+                {
+                    case ActiveTab.Summary:
+                        if (!m_ProfileSingleView.IsDataValid())
+                        {
+                            if (m_ProfileLeftView.IsDataValid())
+                            {
+                                SetView(m_ProfileSingleView, m_ProfileLeftView, m_FrameTimeGraph);
+
+                                m_RequestAnalysis = true;
+                                m_FullAnalysisRequired = true;
+                            }
+                            else if (m_ProfileRightView.IsDataValid())
+                            {
+                                SetView(m_ProfileSingleView, m_ProfileRightView, m_FrameTimeGraph);
+
+                                m_RequestAnalysis = true;
+                                m_FullAnalysisRequired = true;
+                            }
+                        }
+                        break;
+                    case ActiveTab.Compare:
+                        if ((!m_ProfileLeftView.IsDataValid() || !m_ProfileRightView.IsDataValid()) && m_ProfileSingleView.IsDataValid())
+                        {
+                            if (!m_ProfileLeftView.IsDataValid())
+                            {
+                                SetView(m_ProfileLeftView, m_ProfileSingleView, m_LeftFrameTimeGraph);
+                            }
+
+                            if (!m_ProfileRightView.IsDataValid())
+                            {
+                                SetView(m_ProfileRightView, m_ProfileSingleView, m_RightFrameTimeGraph);
+                            }
+
+                            // Remove pairing of both left/right point at the same data
+                            if (m_ProfileLeftView.path == m_ProfileRightView.path)
+                            {
+                                SetFrameTimeGraphPairing(false);
+                            }
+
+                            m_RequestCompare = true;
+                            m_FullCompareRequired = true;
+                        }
+                        break;
+                }
+
+                UpdateThreadNames();
+                BuildRemoveMarkerList();
+
+                if (!m_OtherTableDirty)
+                    SelectMarker(m_SelectedMarker.name);
+
+                if (m_OtherTabDirty)
+                {
+                    UpdateActiveTab(true, false);  // Make sure any depth/thread updates are applied when switching tabs, but don't dirty the other tab
+                    m_OtherTabDirty = false;
+                }
+
+                if (m_OtherTableDirty)
+                {
+                    UpdateMarkerTable(false);  // Make sure any marker selection updates are applied when switching tabs, but don't dirty the other tab
+                    m_OtherTableDirty = false;
+                }
+
+                if (!m_RequestAnalysis && !m_RequestCompare)
+                    m_DepthSliceUI.UpdateDepthFilters(m_ActiveTab == ActiveTab.Summary, m_ProfileSingleView, m_ProfileLeftView, m_ProfileRightView);
+            }
+        }
+
+        bool IsDocked()
+        {
+            return docked;
+        }
+
+        void CheckScreenSizeChanges()
+        {
+            // We get a 5 pixel change in y height during initialization.
+            // We could wait before considering size changes but using a delta is also useful
+            float sizeDeltaForChange = 10;
+
+            Vector2 sizeDiff = position.size - m_LastScreenSize;
+            if (Math.Abs(sizeDiff.x) > sizeDeltaForChange || Math.Abs(sizeDiff.y) > sizeDeltaForChange)
+            {
+                if (m_LastScreenSize.x != 0) // At initialization time the screen size has not yet been recorded. Don't consider this a screen size change
+                {
+                    m_LastScreenSize = position.size;
+                    if (!m_ScreenSizeChanged)
+                    {
+                        // Record when we started the change
+                        m_ScreenSizeChanged = true;
+                        m_ScreenSizeChangedTimeStarted = EditorApplication.timeSinceStartup;
+                    }
+                    // Record the last time of a change
+                    m_ScreenSizeChangedTimeFinished = EditorApplication.timeSinceStartup;
+
+                    // Record which tab we were on when it was changed
+                    m_ScreenSizeChangedTab = m_ActiveTab;
+                }
+            }
+
+            if (m_ScreenSizeChanged)
+            {
+                double secondsSinceChanged = (EditorApplication.timeSinceStartup - m_ScreenSizeChangedTimeFinished);
+                double secondsToDelay = 3f;
+                if (secondsSinceChanged > secondsToDelay)
+                {
+                    // Send analytic
+                    var uiResizeView = m_ScreenSizeChangedTab == ActiveTab.Summary ? ProfileAnalyzerAnalytics.UIResizeView.Single : ProfileAnalyzerAnalytics.UIResizeView.Comparison;
+                    float durationInSeconds = (float)(m_ScreenSizeChangedTimeFinished - m_ScreenSizeChangedTimeStarted);
+                    ProfileAnalyzerAnalytics.SendUIResizeEvent(uiResizeView, durationInSeconds, position.size.x, position.size.y, IsDocked());
+
+                    m_ScreenSizeChanged = false;
+                }
+            }
+        }
+
+        internal void RequestRepaint()
+        {
+            m_RequestRepaint = true;
+        }
+
+        void ProcessInput()
+        {
+            FrameTimeGraph.State inputStatus = FrameTimeGraph.State.None;
+
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                inputStatus = m_FrameTimeGraph.ProcessInput();
+            }
+            else if (m_ActiveTab == ActiveTab.Compare)
+            {
+                if (m_ProfileLeftView.IsDataValid() && inputStatus == FrameTimeGraph.State.None)
+                    inputStatus = m_LeftFrameTimeGraph.ProcessInput();
+
+                if (m_ProfileRightView.IsDataValid() && inputStatus == FrameTimeGraph.State.None)
+                    inputStatus = m_RightFrameTimeGraph.ProcessInput();
+            }
+
+            switch (inputStatus)
+            {
+                case FrameTimeGraph.State.Dragging:
+                    m_RequestRepaint = true;
+                    break;
+                case FrameTimeGraph.State.DragComplete:
+                    m_RequestCompare = true;
+                    break;
+            }
+
+            if (Event.current.isKey && Event.current.type == EventType.KeyDown)
+            {
+                switch (Event.current.keyCode)
+                {
+                    case KeyCode.Alpha1:
+                        if (m_ActiveTab == ActiveTab.Summary)
+                        {
+                            m_FrameTimeGraph.MakeGraphActive(true);
+                            GUI.FocusControl("FrameTimeGraph");
+                        }
+                        else if (m_ActiveTab == ActiveTab.Compare)
+                        {
+                            m_LeftFrameTimeGraph.MakeGraphActive(true);
+                            GUI.FocusControl("LeftFrameTimeGraph");
+                        }
+
+                        m_RequestRepaint = true;
+                        break;
+                    case KeyCode.Alpha2:
+                        if (m_ActiveTab == ActiveTab.Compare)
+                        {
+                            m_RightFrameTimeGraph.MakeGraphActive(true);
+                            GUI.FocusControl("RightFrameTimeGraph");
+                        }
+                        m_RequestRepaint = true;
+                        break;
+                }
+            }
+        }
+
+        //Check if the ProfileDataView is in sync with the loaded frame data inside the profiler window
+        //We are required to do this check in order to either enable or disable the ability to
+        //jump into the matching frame data(loaded in the profiler window) for a specific profile analyzer capture
+        void VerifyFrameDataInSyncWithProfilerWindow(ProfileDataView dataView)
+        {
+            var firstFrameIdx = m_ProfilerFirstFrameIndex - 1;
+            var incompleteFrameCount = 0;
+            if (dataView != null && dataView.data != null)
+                incompleteFrameCount = (dataView.data.FirstFrameIncomplete ? 1 : 0) + (dataView.data.LastFrameIncomplete ? 1 : 0);
+
+            var loadedFrameCount = m_ProfilerLastFrameIndex - m_ProfilerFirstFrameIndex + (firstFrameIdx != -1 ? 1 : 0)
+                - incompleteFrameCount;
+
+            if (loadedFrameCount == 0
+                || !dataView.IsDataValid() //check if the data is valid and potentially reload the file, .data shouldn't be accessed before this point
+                || dataView.data.GetFrameCount() != loadedFrameCount
+                || m_ProfilerWindowInterface.GetThreadCountForFrame(firstFrameIdx) != dataView.data.GetFrame(0).threads.Count)
+            {
+                dataView.inSyncWithProfilerData = false;
+            }
+            else
+            {
+                var pDataFrame = dataView.data.GetFrame(0); //get the first frame we don't care about the offset as we only need to compare frames
+                var loadedFrame = m_ProfilerWindowInterface.GetProfileFrameForThread(firstFrameIdx, 0);
+                //compare frame start time and duration
+                //todo improve this
+                if (pDataFrame.msStartTime != loadedFrame.msStartTime
+                    || pDataFrame.msFrame != loadedFrame.msFrame)
+                {
+                    dataView.inSyncWithProfilerData = false;
+                }
+                else
+                {
+                    dataView.inSyncWithProfilerData = true;
+                }
+            }
+        }
+
+        //Returns true if we were able to sync with the window, but not necessarily if the data is in sync
+        bool SyncWithProfilerWindow()
+        {
+            if (m_ProfilerWindowInterface.IsReady())
+            {
+                // Check if a new profile has been recorded (or loaded) by checking the frame index range.
+                int first;
+                int last;
+                m_ProfilerWindowInterface.GetFrameRangeFromProfiler(out first, out last);
+                if (first != m_ProfilerFirstFrameIndex || last != m_ProfilerLastFrameIndex)
+                {
+                    // Store the updated range and alter the pull range
+                    m_ProfilerFirstFrameIndex = first;
+                    m_ProfilerLastFrameIndex = last;
+                }
+
+                VerifyFrameDataInSyncWithProfilerWindow(m_ProfileSingleView);
+                VerifyFrameDataInSyncWithProfilerWindow(m_ProfileLeftView);
+                VerifyFrameDataInSyncWithProfilerWindow(m_ProfileRightView);
+
+                return true;
+            }
+
+            m_ProfilerWindowInterface.GetProfilerWindowHandle();
+            return false;
+        }
+
+        void OnProfilerWindowCpuModuleSelectionChanged(string selectedMarker, string threadGroupName, string threadName)
+        {
+            // selectedMarker can be "" if in play mode and no active timeline shown (on versions pre 2021.1
+            if (!string.IsNullOrEmpty(selectedMarker) && selectedMarker != m_LastProfilerSelectedMarker)
+            {
+                m_LastProfilerSelectedMarker = selectedMarker;
+                m_SelectionEventFromProfilerWindowInProgress = true;
+                SelectMarker(selectedMarker, threadGroupName, threadName);
+                m_SelectionEventFromProfilerWindowInProgress = false;
+                Repaint();
+            }
+        }
+
+        void OnProfilerWindowSelectedFrameChanged(int newlySelectedFrame)
+        {
+            // selectedMarker can be "" if in play mode and no active timeline shown (on versions pre 2021.1
+            if (!string.IsNullOrEmpty(m_LastProfilerSelectedMarker))
+            {
+                m_SelectionEventFromProfilerWindowInProgress = true;
+                UpdateSelectedMarkerName(m_LastProfilerSelectedMarker);
+                m_SelectionEventFromProfilerWindowInProgress = false;
+                Repaint();
+            }
+        }
+
+        void Update()
+        {
+            CheckScreenSizeChanges();
+
+            // Check if profiler is open
+            if (SyncWithProfilerWindow())
+            {
+                // Check if the selected marker in the profiler has changed
+                m_ProfilerWindowInterface.PollProfilerWindowMarkerName();
+
+                m_ProfilerWindowInterface.PollSelectedFrameChanges();
+            }
+
+            // Deferred to here so drawing isn't messed up by changing tab half way through a function rendering the old tab
+            ProcessTabSwitch();
+
+            // Force repaint for the progress bar
+            if (IsAnalysisRunning())
+            {
+                int loadingProgress;
+                int analysisProgress;
+                if (IsLoading())
+                {
+                    loadingProgress = (int)(ProfileData.GetLoadingProgress() * 100);
+                    analysisProgress = 0;
+                }
+                else
+                {
+                    loadingProgress = 100;
+                    analysisProgress = m_ProfileAnalyzer.GetProgress();
+                    if (m_ThreadPhases > 1)
+                    {
+                        // Use thread phases to evaluate the progress as analysis process might contain multiple ProfileAnalyzer passes.
+                        analysisProgress = (100 * m_ThreadPhase) / m_ThreadPhases;
+                    }
+                }
+
+                int progress = (loadingProgress + analysisProgress) / 2;
+                if (m_ThreadProgress != progress)
+                {
+                    m_ThreadProgress = progress;
+                    m_RequestRepaint = true;
+                }
+            }
+
+            if (m_ThreadSelectionNew != null)
+            {
+                m_ThreadSelection = new ThreadSelection(m_ThreadSelectionNew);
+                m_ThreadSelectionNew = null;
+                m_ThreadSelectionSummary = CalculateSelectedThreadsSummary();
+            }
+
+            switch (m_ThreadActivity)
+            {
+                case ThreadActivity.AnalyzeDone:
+                    // Create table when analysis complete
+                    UpdateAnalysisFromAsyncProcessing(m_ProfileSingleView, m_FullAnalysisRequired);
+                    m_FullAnalysisRequired = false;
+
+                    UpdateThreadNames();
+                    BuildRemoveMarkerList();
+
+                    if (m_ProfileSingleView.analysis != null)
+                    {
+                        CreateProfileTable();
+                        m_RequestRepaint = true;
+                    }
+                    m_ThreadActivity = ThreadActivity.None;
+
+                    if (m_NewDataLoaded)
+                    {
+                        if (m_ProfileSingleView.IsDataValid())
+                        {
+                            // Don't bother sending an analytic if the data set is empty (should never occur anyway but consistent with comparison flow)
+                            ProfileAnalyzerAnalytics.SendUIUsageModeEvent(ProfileAnalyzerAnalytics.UIUsageMode.Single, m_LastAnalysisTimeMilliseconds / 1000f);
+                        }
+                        m_NewDataLoaded = false;
+                    }
+
+                    SelectMarker(m_SelectedMarker.name);
+                    break;
+
+                case ThreadActivity.CompareDone:
+                    UpdateAnalysisFromAsyncProcessing(m_ProfileLeftView, m_FullCompareRequired);
+                    UpdateAnalysisFromAsyncProcessing(m_ProfileRightView, m_FullCompareRequired);
+                    m_FullCompareRequired = false;
+                    m_Pairings = m_PairingsNew;
+                    m_TotalCombinedMarkerCount = m_TotalCombinedMarkerCountNew;
+
+                    UpdateThreadNames();
+                    BuildRemoveMarkerList();
+
+                    if (m_ProfileLeftView.analysis != null && m_ProfileRightView.analysis != null)
+                    {
+                        CreateComparisonTable();
+                        m_RequestRepaint = true;
+                    }
+                    m_ThreadActivity = ThreadActivity.None;
+
+                    if (m_NewComparisonDataLoaded)
+                    {
+                        if (m_ProfileLeftView.IsDataValid() && m_ProfileRightView.IsDataValid())
+                        {
+                            // Don't bother sending an analytic when one (or more) of the data sets is blank (as no comparison is really made)
+                            ProfileAnalyzerAnalytics.SendUIUsageModeEvent(ProfileAnalyzerAnalytics.UIUsageMode.Comparison, m_LastCompareTimeMilliseconds / 1000f);
+                        }
+                        m_NewComparisonDataLoaded = false;
+                    }
+
+                    SelectMarker(m_SelectedMarker.name);
+                    break;
+
+                case ThreadActivity.LoadDone:
+                    SetView(GetActiveView, m_ProfilerData, m_Path, GetActiveFrameTimeGraph);
+                    switch (m_ActiveTab)
+                    {
+                        case ActiveTab.Compare:
+                            // Remove pairing if both left/right point at the same data
+                            if (m_ProfileLeftView.path == m_ProfileRightView.path)
+                            {
+                                SetFrameTimeGraphPairing(false);
+                            }
+
+                            m_FullCompareRequired = true;
+                            m_RequestCompare = true;
+                            break;
+                        case ActiveTab.Summary:
+                            m_RequestAnalysis = true;
+                            m_FullAnalysisRequired = true;
+                            break;
+                        default:
+                            throw new ArgumentOutOfRangeException();
+                    }
+                    m_ThreadActivity = ThreadActivity.None;
+                    break;
+            }
+
+            if (m_RequestAnalysis)
+            {
+                if (!IsAnalysisRunning())
+                {
+                    Analyze();
+                    m_RequestAnalysis = false;
+                }
+            }
+            if (m_RequestCompare)
+            {
+                if (!IsAnalysisRunning())
+                {
+                    Compare();
+                    m_RequestCompare = false;
+                }
+            }
+
+            if (m_RequestRepaint)
+            {
+                Repaint();
+                m_RequestRepaint = false;
+            }
+
+            if (m_AnalyzeInUpdatePhase > 0)
+            {
+                switch (m_AnalyzeInUpdatePhase)
+                {
+                    case 1:
+                        UnityEngine.Profiling.Profiler.enabled = true;
+                        m_AnalyzeInUpdatePhase++;
+                        return;
+                    case 2:
+                        AnalyzeSync();
+                        UpdateAnalysisFromAsyncProcessing(m_ProfileSingleView, m_FullAnalysisRequired);
+                        m_FullAnalysisRequired = false;
+                        m_AnalyzeInUpdatePhase++;
+                        return;
+                    case 3:
+                        m_AnalyzeInUpdatePhase++;
+                        return;
+                    case 4:
+                        UnityEngine.Profiling.Profiler.enabled = false;
+                        m_AnalyzeInUpdatePhase++;
+                        return;
+                    default:
+                        m_AnalyzeInUpdatePhase = 0;
+                        break;
+                }
+            }
+        }
+
+        ProfileDataView GetActiveView
+        {
+            get
+            {
+                switch (m_ActiveLoadingView)
+                {
+                    case ActiveView.Single:
+                        return m_ProfileSingleView;
+                    case ActiveView.Left:
+                        return m_ProfileLeftView;
+                    case ActiveView.Right:
+                        return m_ProfileRightView;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+        }
+
+        FrameTimeGraph GetActiveFrameTimeGraph
+        {
+            get
+            {
+                switch (m_ActiveLoadingView)
+                {
+                    case ActiveView.Single:
+                        return m_FrameTimeGraph;
+                    case ActiveView.Left:
+                        return m_LeftFrameTimeGraph;
+                    case ActiveView.Right:
+                        return m_RightFrameTimeGraph;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+        }
+
+        void UpdateAnalysisFromAsyncProcessing(ProfileDataView view, bool full)
+        {
+            view.analysis = view.analysisNew;
+            if (full)
+            {
+                if (view.selectedIndices != null && view.IsDataValid() && view.selectedIndices.Count == view.data.GetFrameCount())
+                    view.analysisFull = view.analysis;
+                else
+                    view.analysisFull = view.analysisFullNew;
+
+                if (view.IsDataValid())
+                    view.FindKeyMarkers();
+            }
+        }
+
+        List<FrameTimeGraph.Data> GetFrameTimeData(ProfileData profileData)
+        {
+            List<FrameTimeGraph.Data> data = new List<FrameTimeGraph.Data>();
+            int frames = profileData.GetFrameCount();
+
+            bool removeFrameSyncTime = false;
+            int removeMarkerIndex = -1;
+            ThreadIdentifier mainThreadSelection = new ThreadIdentifier("Main Thread", 1);;
+
+            string removeMarker = GetRemoveMarker();
+            if (removeMarker != null)
+            {
+                // Find marker to remove
+                removeMarkerIndex = profileData.GetMarkerIndex(removeMarker);
+                removeFrameSyncTime = (removeMarkerIndex != -1);
+            }
+
+
+            for (int frameOffset = 0; frameOffset < frames; frameOffset++)
+            {
+                ProfileFrame frame = profileData.GetFrame(frameOffset);
+                float ms = frame.msFrame;
+
+                if (removeFrameSyncTime)
+                {
+                    for (int threadIndex = 0; threadIndex < frame.threads.Count; threadIndex++)
+                    {
+                        ProfileThread thread = frame.threads[threadIndex];
+                        // Marker only on main thread
+                        if (profileData.GetThreadName(thread) == mainThreadSelection.threadNameWithIndex)
+                        {
+                            foreach (var marker in thread.markers)
+                            {
+                                if (marker.nameIndex != removeMarkerIndex)
+                                    continue;
+
+                                // May be multiple instances of this marker in the 'custom' case (so we can't just break out of marker loop here)
+                                ms-= marker.msMarkerTotal;
+                            }
+                            break;
+                        }
+                    }
+                }
+                FrameTimeGraph.Data dataPoint = new FrameTimeGraph.Data(ms, frameOffset);
+                data.Add(dataPoint);
+            }
+
+            return data;
+        }
+
+        void Load()
+        {
+            m_Path = EditorUtility.OpenFilePanel("Load profile analyzer data file", "", "pdata");
+            if (m_Path.Length != 0)
+            {
+                m_ActiveLoadingView = ActiveView.Single;
+                BeginAsyncAction(ThreadActivity.Load);
+            }
+            GUIUtility.ExitGUI();
+        }
+
+        void UpdateMatchingProfileData(ProfileData data, ref string path, ProfileAnalysis analysis, string newPath)
+        {
+            // Update left/right data if we are effectively overwriting it.
+            if (m_ProfileLeftView.path == newPath)
+            {
+                SetView(m_ProfileLeftView, data, newPath, m_LeftFrameTimeGraph);
+
+                m_RequestCompare = true;
+                m_FullCompareRequired = true;
+            }
+            if (m_ProfileRightView.path == newPath)
+            {
+                SetView(m_ProfileRightView, data, newPath, m_RightFrameTimeGraph);
+
+                m_RequestCompare = true;
+                m_FullCompareRequired = true;
+            }
+
+            // Update single view if needed
+            if (m_ProfileSingleView.path == newPath)
+            {
+                SetView(m_ProfileSingleView, data, newPath, m_FrameTimeGraph);
+
+                m_ProfileSingleView.analysis = analysis;
+            }
+
+            path = newPath;
+        }
+
+        void Save(ProfileDataView dataView, bool updateDataViewWithSelectedPath = false)
+        {
+            string newPath = EditorUtility.SaveFilePanel("Save profile analyzer data file", "", "capture.pdata", "pdata");
+            if (newPath.Length != 0)
+            {
+                if (updateDataViewWithSelectedPath)
+                {
+                    dataView.path = newPath;
+                }
+
+                if (ProfileData.Save(newPath, dataView.data))
+                {
+                    UpdateMatchingProfileData(dataView.data, ref dataView.path, dataView.analysis, newPath);
+                }
+            }
+            GUIUtility.ExitGUI();
+        }
+
+        int GetTotalCombinedMarkerCount(ProfileData left, ProfileData right)
+        {
+            if (left == null)
+                return 0;
+            if (right == null)
+                return 0;
+            List<string> leftMarkers = left.GetMarkerNames();
+            if (leftMarkers == null)
+                return 0;
+            List<string> rightMarkers = right.GetMarkerNames();
+            if (rightMarkers == null)
+                return 0;
+
+            HashSet<string> markerPairs = new HashSet<string>();
+            for (int index = 0; index < leftMarkers.Count; index++)
+            {
+                string markerName = leftMarkers[index];
+
+                markerPairs.Add(markerName);
+            }
+            for (int index = 0; index < rightMarkers.Count; index++)
+            {
+                string markerName = rightMarkers[index];
+
+                if (!markerPairs.Contains(markerName))
+                {
+                    markerPairs.Add(markerName);
+                }
+            }
+
+            return markerPairs.Count;
+        }
+
+        List<MarkerPairing> GeneratePairings(ProfileAnalysis leftAnalysis, ProfileAnalysis rightAnalysis)
+        {
+            if (leftAnalysis == null)
+                return null;
+            if (rightAnalysis == null)
+                return null;
+            List<MarkerData> leftMarkers = leftAnalysis.GetMarkers();
+            if (leftMarkers == null)
+                return null;
+            List<MarkerData> rightMarkers = rightAnalysis.GetMarkers();
+            if (rightMarkers == null)
+                return null;
+
+            Dictionary<string, MarkerPairing> markerPairs = new Dictionary<string, MarkerPairing>();
+            for (int index = 0; index < leftMarkers.Count; index++)
+            {
+                MarkerData marker = leftMarkers[index];
+
+                MarkerPairing pair = new MarkerPairing
+                {
+                    name = marker.name,
+                    leftIndex = index,
+                    rightIndex = -1
+                };
+                markerPairs[marker.name] = pair;
+            }
+            for (int index = 0; index < rightMarkers.Count; index++)
+            {
+                MarkerData marker = rightMarkers[index];
+
+                if (markerPairs.ContainsKey(marker.name))
+                {
+                    MarkerPairing pair = markerPairs[marker.name];
+                    pair.rightIndex = index;
+                    markerPairs[marker.name] = pair;
+                }
+                else
+                {
+                    MarkerPairing pair = new MarkerPairing
+                    {
+                        name = marker.name,
+                        leftIndex = -1,
+                        rightIndex = index
+                    };
+                    markerPairs[marker.name] = pair;
+                }
+            }
+
+            List<MarkerPairing> pairings = new List<MarkerPairing>();
+            foreach (MarkerPairing pair in markerPairs.Values)
+                pairings.Add(pair);
+
+            return pairings;
+        }
+
+        void SetThreadPhaseCount(ThreadActivity activity)
+        {
+            // Will be refined by the analysis functions
+            if (activity == ThreadActivity.Compare)
+            {
+                m_ThreadPhases = 8;
+            }
+            else
+            {
+                m_ThreadPhases = 2;
+            }
+        }
+
+        void BeginAsyncAction(ThreadActivity activity)
+        {
+            if (IsAnalysisRunning())
+                return;
+
+            m_ThreadActivity = activity;
+            m_ThreadProgress = 0;
+            m_ThreadPhase = 0;
+            SetThreadPhaseCount(activity);
+
+            m_BackgroundThread = new Thread(BackgroundThread);
+            m_BackgroundThread.Start();
+        }
+
+        void CreateComparisonTable()
+        {
+            UpdateThreadNames();
+
+            // Set default sorting state
+            int sortedColumn = (int)ComparisonTable.MyColumns.AbsDiff;
+            bool sortAscending = false;
+
+            // Query last sorting state
+            if (m_ComparisonMulticolumnHeaderState != null)
+            {
+                if (m_ComparisonMulticolumnHeaderState.sortedColumnIndex >= 0)
+                {
+                    sortedColumn = m_ComparisonMulticolumnHeaderState.sortedColumnIndex;
+                    if (sortedColumn >= 0 && sortedColumn < m_ComparisonMulticolumnHeaderState.columns.Length)
+                        sortAscending = m_ComparisonMulticolumnHeaderState.columns[sortedColumn].sortedAscending;
+                }
+            }
+
+            if (m_ComparisonTreeViewState == null)
+                m_ComparisonTreeViewState = new TreeViewState();
+
+            m_ComparisonMulticolumnHeaderState = ComparisonTable.CreateDefaultMultiColumnHeaderState(m_CompareModeFilter);
+
+            var multiColumnHeader = new MultiColumnHeader(m_ComparisonMulticolumnHeaderState);
+            multiColumnHeader.SetSorting(sortedColumn, sortAscending);
+            multiColumnHeader.ResizeToFit();
+            m_ComparisonTable = new ComparisonTable(m_ComparisonTreeViewState, multiColumnHeader, m_ProfileLeftView, m_ProfileRightView, m_Pairings, m_hideRemovedMarkers, this, m_2D, UIColor.left, UIColor.right);
+
+            if (!IsSelectedMarkerNameValid())
+                SelectPairing(0);
+            else
+                SelectPairingByName(m_SelectedMarker.name);
+        }
+
+        void CalculatePairingbuckets(ProfileAnalysis left, ProfileAnalysis right, List<MarkerPairing> pairings)
+        {
+            var leftMarkers = left.GetMarkers();
+            var rightMarkers = right.GetMarkers();
+            // using a for loop instead of foreach is surprisingly faster on Mono
+            for (int i = 0, n = pairings.Count; i < n; i++)
+            {
+                var pairing = pairings[i];
+                float min = float.MaxValue;
+                float max = 0.0f;
+                MarkerData leftMarker = null;
+                MarkerData rightMarker = null;
+                if (pairing.leftIndex >= 0)
+                {
+                    leftMarker = leftMarkers[pairing.leftIndex];
+                    max = Math.Max(max, leftMarker.msMax);
+                    min = Math.Min(min, leftMarker.msMin);
+                }
+                if (pairing.rightIndex >= 0)
+                {
+                    rightMarker = rightMarkers[pairing.rightIndex];
+                    max = Math.Max(max, rightMarker.msMax);
+                    min = Math.Min(min, rightMarker.msMin);
+                }
+
+                int countMin = int.MaxValue;
+                int countMax = 0;
+                if (leftMarker != null)
+                {
+                    countMax = Math.Max(countMax, leftMarker.countMax);
+                    countMin = Math.Min(countMin, leftMarker.countMin);
+                }
+                if (rightMarker != null)
+                {
+                    countMax = Math.Max(countMax, rightMarker.countMax);
+                    countMin = Math.Min(countMin, rightMarker.countMin);
+                }
+
+                if (leftMarker != null)
+                {
+                    leftMarker.ComputeBuckets(min, max);
+                    leftMarker.ComputeCountBuckets(countMin, countMax);
+                }
+                if (rightMarker != null)
+                {
+                    rightMarker.ComputeBuckets(min, max);
+                    rightMarker.ComputeCountBuckets(countMin, countMax);
+                }
+            }
+        }
+
+        bool CompareSync()
+        {
+            if (!m_ProfileLeftView.IsDataValid())
+                return false;
+            if (!m_ProfileRightView.IsDataValid())
+                return false;
+
+            List<string> threadUINamesNew;
+            List<string> threadNamesNew;
+            Dictionary<string, string> threadNameToUINameNew;
+
+            GetThreadNames(m_ProfileLeftView.data, m_ProfileRightView.data, out threadUINamesNew, out threadNamesNew, out threadNameToUINameNew);
+            List<string> threadSelection = GetLimitedThreadSelection(threadNamesNew, m_ThreadSelection);
+
+            System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();
+            stopwatch.Start();
+
+            int updateDepthPhase = m_NewComparisonDataLoaded ? 2 : 0;
+            int fullLeftPhase = (m_FullCompareRequired && m_ProfileLeftView.selectedIndices.Count != m_ProfileLeftView.data.GetFrameCount()) ? 1 : 0;
+            int fullRightPhase = (m_FullCompareRequired && m_ProfileLeftView.selectedIndices.Count != m_ProfileLeftView.data.GetFrameCount()) ? 1 : 0;
+            m_ThreadPhases = 2 /*scan left and right*/ + updateDepthPhase + 2 /*fullLeftPhase and fullRightPhase*/ + 2 /*analyze left and right*/;
+
+            bool selfTimes = IsSelfTime();
+
+            // First scan just the frames
+            m_ThreadPhase = 0;
+            var leftAnalysisNew = m_ProfileAnalyzer.Analyze(m_ProfileLeftView.data, m_ProfileLeftView.selectedIndices, null, m_DepthSliceUI.depthFilter1, selfTimes, m_ParentMarker, 0, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+            m_ThreadPhase++;
+            var rightAnalysisNew = m_ProfileAnalyzer.Analyze(m_ProfileRightView.data, m_ProfileRightView.selectedIndices, null, m_DepthSliceUI.depthFilter2, selfTimes, m_ParentMarker, 0, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+            m_ThreadPhase++;
+
+            if (leftAnalysisNew == null || rightAnalysisNew == null)
+            {
+                stopwatch.Stop();
+                return false;
+            }
+
+            // Calculate the max frame time of the two scans
+            float timeScaleMax = Math.Max(leftAnalysisNew.GetFrameSummary().msMax, rightAnalysisNew.GetFrameSummary().msMax);
+
+            // Need to recalculate the depth difference when thread filters change
+            // For now do it always if the depth is auto and not 'all'
+            if (updateDepthPhase != 0)
+            {
+                var leftAnalysis = m_ProfileAnalyzer.Analyze(m_ProfileLeftView.data, m_ProfileLeftView.selectedIndices, threadSelection, ProfileAnalyzer.kDepthAll, selfTimes, m_ParentMarker, timeScaleMax, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+                m_ThreadPhase++;
+                var rightAnalysis = m_ProfileAnalyzer.Analyze(m_ProfileRightView.data, m_ProfileRightView.selectedIndices, threadSelection, ProfileAnalyzer.kDepthAll, selfTimes, m_ParentMarker, timeScaleMax, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+                m_ThreadPhase++;
+
+                var pairings = GeneratePairings(leftAnalysis, rightAnalysis);
+
+                if (m_DepthSliceUI.UpdateDepthForCompareSync(leftAnalysis, rightAnalysis, pairings, m_ProfileLeftView, m_ProfileRightView))
+                {
+                    // New depth diff calculated to we need to do the full analysis
+                    if (fullLeftPhase == 0)
+                        fullLeftPhase = 1;
+                    if (fullRightPhase == 0)
+                        fullRightPhase = 1;
+                }
+            }
+
+            // Now process the markers and setup buckets using the overall max frame time
+            List<int> selection = new List<int>();
+            if (fullLeftPhase != 0)
+            {
+                selection.Clear();
+                for (int frameOffset = 0; frameOffset < m_ProfileLeftView.data.GetFrameCount(); frameOffset++)
+                {
+                    selection.Add(m_ProfileLeftView.data.OffsetToDisplayFrame(frameOffset));
+                }
+
+                // We don't pass timeScaleMax as that is only for the selected region.
+                // Pass 0 to auto select full range
+                m_ProfileLeftView.analysisFullNew = m_ProfileAnalyzer.Analyze(m_ProfileLeftView.data, selection, threadSelection, m_DepthSliceUI.depthFilter1, selfTimes, m_ParentMarker, 0, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+                m_ThreadPhase++;
+            }
+            m_ThreadPhase++;
+
+            if (fullRightPhase != 0)
+            {
+                selection.Clear();
+                for (int frameOffset = 0; frameOffset < m_ProfileRightView.data.GetFrameCount(); frameOffset++)
+                {
+                    selection.Add(m_ProfileRightView.data.OffsetToDisplayFrame(frameOffset));
+                }
+
+                // We don't pass timeScaleMax as that is only for the selected region.
+                // Pass 0 to auto select full range
+                m_ProfileRightView.analysisFullNew = m_ProfileAnalyzer.Analyze(m_ProfileRightView.data, selection, threadSelection, m_DepthSliceUI.depthFilter2, selfTimes, m_ParentMarker, 0, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+                m_ThreadPhase++;
+            }
+            m_ThreadPhase++;
+
+            m_ProfileLeftView.analysisNew = m_ProfileAnalyzer.Analyze(m_ProfileLeftView.data, m_ProfileLeftView.selectedIndices, threadSelection, m_DepthSliceUI.depthFilter1, selfTimes, m_ParentMarker, timeScaleMax, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+            m_ThreadPhase++;
+
+            m_ProfileRightView.analysisNew = m_ProfileAnalyzer.Analyze(m_ProfileRightView.data, m_ProfileRightView.selectedIndices, threadSelection, m_DepthSliceUI.depthFilter2, selfTimes, m_ParentMarker, timeScaleMax, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+            m_ThreadPhase++;
+
+            m_TotalCombinedMarkerCountNew = GetTotalCombinedMarkerCount(m_ProfileLeftView.data, m_ProfileRightView.data);
+            m_PairingsNew = GeneratePairings(m_ProfileLeftView.analysisNew, m_ProfileRightView.analysisNew);
+
+            CalculatePairingbuckets(m_ProfileLeftView.analysisNew, m_ProfileRightView.analysisNew, m_PairingsNew);
+
+            stopwatch.Stop();
+            m_LastCompareTimeMilliseconds = stopwatch.ElapsedMilliseconds;
+
+            TimeSpan ts = stopwatch.Elapsed;
+            if (ts.Minutes > 0)
+                m_LastCompareTime = string.Format("Last compare time {0} mins {1} secs {2} ms ", ts.Minutes, ts.Seconds, ts.Milliseconds);
+            else if (ts.Seconds > 0)
+                m_LastCompareTime = string.Format("Last compare time {0} secs {1} ms ", ts.Seconds, ts.Milliseconds);
+            else
+                m_LastCompareTime = string.Format("Last compare time {0} ms ", ts.Milliseconds);
+
+            return true;
+        }
+
+        void Compare()
+        {
+            if (m_Async)
+            {
+                //m_comparisonTable = null;
+                //m_ProfileLeftView.analysis = null;
+                //m_ProfileRightView.analysis = null;
+                BeginAsyncAction(ThreadActivity.Compare);
+            }
+            else
+            {
+                CompareSync();
+
+                UpdateAnalysisFromAsyncProcessing(m_ProfileLeftView, m_FullCompareRequired);
+                UpdateAnalysisFromAsyncProcessing(m_ProfileRightView, m_FullCompareRequired);
+                m_FullCompareRequired = false;
+            }
+        }
+
+        List<MarkerPairing> GetPairings()
+        {
+            return m_Pairings;
+        }
+
+        int GetUnsavedIndex(string path)
+        {
+            if (path == null)
+                return 0;
+
+            Regex unsavedRegExp = new Regex(@"^Unsaved[\s*]([\d]*)", RegexOptions.IgnoreCase);
+            Match match = unsavedRegExp.Match(path);
+            if (match.Length <= 0)
+                return 0;
+
+            return Int32.Parse(match.Groups[1].Value);
+        }
+
+        void PullFromProfiler(int firstFrame, int lastFrame, ProfileDataView view, FrameTimeGraph frameTimeGraph)
+        {
+            m_ProgressBar.InitProgressBar("Pulling Frames from Profiler", "Please wait...", lastFrame - firstFrame);
+
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            ProfileData newProfileData = m_ProfilerWindowInterface.PullFromProfiler(firstFrame, lastFrame);
+            ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.Pull, analytic);
+
+            frameTimeGraph.Reset();
+            frameTimeGraph.SetData(GetFrameTimeData(newProfileData));
+
+            // Check if this is new data (rather than repulling the same data)
+            if (!newProfileData.IsSame(view.data))
+            {
+                if (view == m_ProfileSingleView)
+                    m_NewDataLoaded = true;
+                else
+                    m_NewComparisonDataLoaded = true;
+            }
+
+            // Update the path to use the same saved file name if this is the same data as another view
+            if (newProfileData.IsSame(m_ProfileLeftView.data))
+            {
+                view.path = m_ProfileLeftView.path;
+            }
+            else if (newProfileData.IsSame(m_ProfileRightView.data))
+            {
+                view.path = m_ProfileRightView.path;
+            }
+            else if (newProfileData.IsSame(m_ProfileSingleView.data))
+            {
+                view.path = m_ProfileSingleView.path;
+            }
+            else
+            {
+                int lastIndex = 0;
+                lastIndex = Math.Max(lastIndex, GetUnsavedIndex(m_ProfileSingleView.path));
+                lastIndex = Math.Max(lastIndex, GetUnsavedIndex(m_ProfileLeftView.path));
+                lastIndex = Math.Max(lastIndex, GetUnsavedIndex(m_ProfileRightView.path));
+                view.path = string.Format("Unsaved {0}", lastIndex + 1);
+            }
+
+            if (view.data != null && !TmpInUse(view, view.data.FilePath))
+                view.data.DeleteTmpFiles();
+
+            view.data = newProfileData;
+            view.SelectFullRange();
+
+            // Remove pairing if both left/right point at the same data
+            if (m_ProfileLeftView.path == m_ProfileRightView.path)
+            {
+                SetFrameTimeGraphPairing(false);
+            }
+
+            m_ProgressBar.ClearProgressBar();
+        }
+
+        void BackgroundThread()
+        {
+            try
+            {
+                switch (m_ThreadActivity)
+                {
+                    case ThreadActivity.Analyze:
+                        AnalyzeSync();
+                        m_ThreadActivity = ThreadActivity.AnalyzeDone;
+                        break;
+
+                    case ThreadActivity.Compare:
+                        CompareSync();
+                        m_ThreadActivity = ThreadActivity.CompareDone;
+                        break;
+
+                    case ThreadActivity.AnalyzeDone:
+                        break;
+
+                    case ThreadActivity.CompareDone:
+                        break;
+
+                    case ThreadActivity.Load:
+                        m_ThreadActivity = ProfileData.Load(m_Path, out m_ProfilerData) ? ThreadActivity.LoadDone : ThreadActivity.None;
+                        break;
+
+                    case ThreadActivity.LoadDone:
+                        break;
+
+                    default:
+                        // m_threadActivity = ThreadActivity.None;
+                        break;
+                }
+            }
+            catch (ThreadAbortException)
+            {
+                var activity = (m_ThreadActivity == ThreadActivity.Load) ? "Load" : "Analysis";
+                Debug.LogFormat("{0} failed due to a domain reload. Please try again.", activity);
+            }
+        }
+
+        void SelectFirstMarkerInTable()
+        {
+            // SelectMarkerByIndex(0) would only select the first one found, not the first in the sorted list
+
+            if (m_ProfileTable == null)
+                return;
+
+            var rows = m_ProfileTable.GetRows();
+            if (rows == null || rows.Count < 1)
+                return;
+
+            SelectMarkerByName(rows[0].displayName);
+        }
+
+        bool IsSelectedMarkerNameValid()
+        {
+            if (string.IsNullOrEmpty(m_SelectedMarker.name))
+                return false;
+
+            if (m_hideRemovedMarkers && m_SelectedMarker.name == GetRemoveMarker())
+                return false;
+
+            return true;
+        }
+
+        void CreateProfileTable()
+        {
+            if (m_ProfileTreeViewState == null)
+                m_ProfileTreeViewState = new TreeViewState();
+
+            // Set default sorting state
+            int sortedColumn = (int)ProfileTable.MyColumns.Median;
+            bool sortAscending = false;
+
+            // Query last sorting state
+            if (m_ProfileMulticolumnHeaderState != null)
+            {
+                if (m_ProfileMulticolumnHeaderState.sortedColumnIndex >= 0)
+                {
+                    sortedColumn = m_ProfileMulticolumnHeaderState.sortedColumnIndex;
+                    if (sortedColumn >= 0 && sortedColumn < m_ProfileMulticolumnHeaderState.columns.Length)
+                        sortAscending = m_ProfileMulticolumnHeaderState.columns[sortedColumn].sortedAscending;
+                }
+            }
+
+            m_ProfileMulticolumnHeaderState = ProfileTable.CreateDefaultMultiColumnHeaderState(m_SingleModeFilter);
+
+            var multiColumnHeader = new MultiColumnHeader(m_ProfileMulticolumnHeaderState);
+            multiColumnHeader.SetSorting(sortedColumn, sortAscending);
+            multiColumnHeader.ResizeToFit();
+            m_ProfileTable = new ProfileTable(m_ProfileTreeViewState, multiColumnHeader, m_ProfileSingleView, m_hideRemovedMarkers, this, m_2D, UIColor.bar);
+
+            if (!IsSelectedMarkerNameValid())
+                SelectFirstMarkerInTable();
+            else
+                SelectMarkerByName(m_SelectedMarker.name);
+
+            UpdateThreadNames();
+        }
+
+        void AnalyzeSync()
+        {
+            if (!m_ProfileSingleView.IsDataValid())
+                return;
+
+            System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();
+            stopwatch.Start();
+
+            List<string> threadUINamesNew;
+            List<string> threadNamesNew;
+            Dictionary<string, string> threadNameToUINameNew;
+
+            GetThreadNames(m_ProfileSingleView.data, out threadUINamesNew, out threadNamesNew, out threadNameToUINameNew);
+            List<string> threadSelection = GetLimitedThreadSelection(threadNamesNew, m_ThreadSelection);
+
+            int fullPhase = (m_FullAnalysisRequired && (m_ProfileSingleView.selectedIndices.Count != m_ProfileSingleView.data.GetFrameCount())) ? 1 : 0;
+            m_ThreadPhases = 1 + fullPhase;
+
+            bool selfTimes = IsSelfTime();
+
+            m_ThreadPhase = 0;
+            if (fullPhase == 1)
+            {
+                List<int> selection = new List<int>();
+                for (int frameOffset = 0; frameOffset < m_ProfileSingleView.data.GetFrameCount(); frameOffset++)
+                {
+                    selection.Add(m_ProfileSingleView.data.OffsetToDisplayFrame(frameOffset));
+                }
+
+                m_ProfileSingleView.analysisFullNew = m_ProfileAnalyzer.Analyze(m_ProfileSingleView.data, selection, threadSelection, m_DepthSliceUI.depthFilter, selfTimes, m_ParentMarker, 0, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+                m_ThreadPhase++;
+            }
+            m_ProfileSingleView.analysisNew = m_ProfileAnalyzer.Analyze(m_ProfileSingleView.data, m_ProfileSingleView.selectedIndices, threadSelection, m_DepthSliceUI.depthFilter, selfTimes, m_ParentMarker, 0, m_hideRemovedMarkers ? GetRemoveMarker() : null);
+            m_ThreadPhase++;
+            stopwatch.Stop();
+            m_LastAnalysisTimeMilliseconds = stopwatch.ElapsedMilliseconds;
+
+            TimeSpan ts = stopwatch.Elapsed;
+            if (ts.Minutes > 0)
+                m_LastAnalysisTime = string.Format("Last analysis time {0} mins {1} secs {2} ms ", ts.Minutes, ts.Seconds, ts.Milliseconds);
+            else if (ts.Seconds > 0)
+                m_LastAnalysisTime = string.Format("Last analysis time {0} secs {1} ms ", ts.Seconds, ts.Milliseconds);
+            else
+                m_LastAnalysisTime = string.Format("Last analysis time {0} ms ", ts.Milliseconds);
+        }
+
+        void Analyze()
+        {
+            if (m_EnableAnalysisProfiling)
+            {
+                m_AnalyzeInUpdatePhase = 1;
+                return;
+            }
+
+            if (m_Async)
+            {
+                //m_profileTable = null;
+                //m_ProfileSingleView.analysis = null;
+                BeginAsyncAction(ThreadActivity.Analyze);
+            }
+            else
+            {
+                AnalyzeSync();
+                UpdateAnalysisFromAsyncProcessing(m_ProfileSingleView, m_FullAnalysisRequired);
+                m_FullAnalysisRequired = false;
+            }
+        }
+
+        void GetThreadNames(ProfileData profleData, out List<string> threadUINames, out List<string> threadFilters, out Dictionary<string, string> threadNameToUIName)
+        {
+            GetThreadNames(profleData, null, out threadUINames, out threadFilters, out threadNameToUIName);
+        }
+
+        public string GetUIThreadName(string threadNameWithIndex)
+        {
+            string threadName = "";
+            m_ThreadNameToUIName.TryGetValue(threadNameWithIndex, out threadName);
+            return threadName;
+        }
+
+        string GetFriendlyThreadName(string threadNameWithIndex, bool single)
+        {
+            if (string.IsNullOrEmpty(threadNameWithIndex))
+                return "";
+
+            var info = threadNameWithIndex.Split(':');
+            int threadGroupIndex = int.Parse(info[0]);
+            var threadName = info[1].Trim();
+
+            if (single) // Single instance of this thread name
+            {
+                return threadName;
+            }
+            else
+            {
+                // The original format was "Worker 0"
+                // The internal formatting is 1:Worker (1+original value).
+                // Hence the -1 here
+                return string.Format("{0} {1}", threadName, threadGroupIndex - 1);
+            }
+        }
+
+        internal int CompareUINames(string a, string b)
+        {
+            var aSpaceIndex = a.LastIndexOf(' ');
+            var bSpaceIndex = b.LastIndexOf(' ');
+
+            if (aSpaceIndex >= 0 && bSpaceIndex >= 0)
+            {
+                var aThreadName = a.Substring(0, aSpaceIndex);
+                var bThreadName = b.Substring(0, bSpaceIndex);
+
+                if (aThreadName == bThreadName)
+                {
+                    var aThreadIndex = a.Substring(aSpaceIndex + 1);
+                    var bThreadIndex = b.Substring(bSpaceIndex + 1);
+
+                    if (aThreadIndex == "All" && bThreadIndex != "All")
+                        return -1;
+                    if (aThreadIndex != "All" && bThreadIndex == "All")
+                        return 1;
+
+                    int aGroupIndex;
+                    if (int.TryParse(aThreadIndex, out aGroupIndex))
+                    {
+                        int bGroupIndex;
+                        if (int.TryParse(bThreadIndex, out bGroupIndex))
+                        {
+                            return aGroupIndex.CompareTo(bGroupIndex);
+                        }
+                    }
+                }
+            }
+
+            return a.CompareTo(b);
+        }
+
+        void GetThreadNames(ProfileData leftData, ProfileData rightData, out List<string> threadUINames, out List<string> threadFilters, out Dictionary<string, string> threadNameToUIName)
+        {
+            List<string> threadNames = (leftData != null) ? new List<string>(leftData.GetThreadNames()) : new List<string>();
+            if (rightData != null)
+            {
+                foreach (var threadNameWithIndex in rightData.GetThreadNames())
+                {
+                    if (!threadNames.Contains(threadNameWithIndex))
+                    {
+                        // TODO: Insert after last thread with same name (or at end)
+                        threadNames.Add(threadNameWithIndex);
+                    }
+                }
+            }
+
+            Dictionary<string, string> threadNamesDict = new Dictionary<string, string>();
+            for (int index = 0; index < threadNames.Count; index++)
+            {
+                var threadNameWithIndex = threadNames[index];
+                var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+
+                if (threadIdentifier.index == 1)
+                {
+                    if (threadNames.Contains(string.Format("2:{0}", threadIdentifier.name)))
+                    {
+                        var threadGroupIdentifier = new ThreadIdentifier(threadIdentifier);
+                        threadGroupIdentifier.SetAll();
+
+                        // First thread name of a group with the same name
+                        // Add an 'all' selection
+                        threadNamesDict[string.Format("{0} : All", threadIdentifier.name)] = threadGroupIdentifier.threadNameWithIndex;
+                        // And add the first item too
+                        threadNamesDict[GetFriendlyThreadName(threadNameWithIndex, false)] = threadNameWithIndex;
+                    }
+                    else
+                    {
+                        // Single instance of this thread name
+                        threadNamesDict[GetFriendlyThreadName(threadNameWithIndex, true)] = threadNameWithIndex;
+                    }
+                }
+                else
+                {
+                    threadNamesDict[GetFriendlyThreadName(threadNameWithIndex, false)] = threadNameWithIndex;
+                }
+            }
+
+            List<string> uiNames = new List<string>();
+            foreach (string uiName in threadNamesDict.Keys)
+                uiNames.Add(uiName);
+
+            uiNames.Sort(CompareUINames);
+
+
+            var allThreadIdentifier = new ThreadIdentifier();
+            allThreadIdentifier.SetName("All");
+            allThreadIdentifier.SetAll();
+
+            threadUINames = new List<string>();
+            threadFilters = new List<string>();
+            threadNameToUIName = new Dictionary<string, string>();
+
+            threadUINames.Add(allThreadIdentifier.name);
+            threadFilters.Add(allThreadIdentifier.threadNameWithIndex);
+            threadNameToUIName[allThreadIdentifier.name] = allThreadIdentifier.threadNameWithIndex;
+
+            foreach (string uiName in uiNames)
+            {
+                // Strip off the group name
+                // Note we don't do this in GetFriendlyThreadName else we would collapse the same named threads (in different groups) in the dict
+                string groupName;
+                string threadName = ProfileData.GetThreadNameWithoutGroup(uiName, out groupName);
+                string threadFilter = threadNamesDict[uiName];
+                threadUINames.Add(threadName);
+                threadFilters.Add(threadFilter);
+
+                threadNameToUIName[threadFilter] = threadName;
+            }
+        }
+
+        void UpdateThreadGroupSelection(List<string> threadNames, ThreadSelection threadSelection)
+        {
+            // Make sure all members of active groups are present
+            foreach (string threadGroupNameWithIndex in threadSelection.groups)
+            {
+                var threadGroupIdentifier = new ThreadIdentifier(threadGroupNameWithIndex);
+                if (threadGroupIdentifier.name == "All" && threadGroupIdentifier.index == ThreadIdentifier.kAll)
+                {
+                    foreach (string threadNameWithIndex in threadNames)
+                    {
+                        var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                        if (threadIdentifier.index != ThreadIdentifier.kAll)
+                        {
+                            if (!threadSelection.selection.Contains(threadNameWithIndex))
+                                threadSelection.selection.Add(threadNameWithIndex);
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (string threadNameWithIndex in threadNames)
+                    {
+                        var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                        if (threadIdentifier.name == threadGroupIdentifier.name &&
+                            threadIdentifier.index != ThreadIdentifier.kAll)
+                        {
+                            if (!threadSelection.selection.Contains(threadNameWithIndex))
+                                threadSelection.selection.Add(threadNameWithIndex);
+                        }
+                    }
+                }
+            }
+        }
+
+        List<string> GetLimitedThreadSelection(List<string> threadNames, ThreadSelection threadSelection)
+        {
+            List<string> limitedThreadSelection = new List<string>();
+            if (threadSelection.selection == null)
+                return limitedThreadSelection;
+
+            foreach (string threadNameWithIndex in threadSelection.selection)
+            {
+                if (threadNames.Contains(threadNameWithIndex))
+                    limitedThreadSelection.Add(threadNameWithIndex);
+            }
+
+            // Make sure all members of active groups are present
+            foreach (string threadGroupNameWithIndex in threadSelection.groups)
+            {
+                var threadGroupIdentifier = new ThreadIdentifier(threadGroupNameWithIndex);
+                if (threadGroupIdentifier.name == "All" && threadGroupIdentifier.index == ThreadIdentifier.kAll)
+                {
+                    foreach (string threadNameWithIndex in threadNames)
+                    {
+                        var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                        if (threadIdentifier.index != ThreadIdentifier.kAll)
+                        {
+                            if (!limitedThreadSelection.Contains(threadNameWithIndex))
+                                limitedThreadSelection.Add(threadNameWithIndex);
+                        }
+                    }
+                }
+                else
+                {
+                    foreach (string threadNameWithIndex in threadNames)
+                    {
+                        var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                        if (threadIdentifier.name == threadGroupIdentifier.name &&
+                            threadIdentifier.index != ThreadIdentifier.kAll)
+                        {
+                            if (!limitedThreadSelection.Contains(threadNameWithIndex))
+                                limitedThreadSelection.Add(threadNameWithIndex);
+                        }
+                    }
+                }
+            }
+
+            return limitedThreadSelection;
+        }
+
+        int ClampToRange(int value, int min, int max)
+        {
+            if (value < min)
+                value = min;
+            if (value > max)
+                value = max;
+
+            return value;
+        }
+
+        void GraphActive(bool active)
+        {
+            RequestRepaint();
+        }
+
+        void SetRange(List<int> selectedOffsets, int clickCount, FrameTimeGraph.State inputStatus)
+        {
+            if (inputStatus == FrameTimeGraph.State.Dragging)
+                return;
+
+            if (clickCount == 2)
+            {
+                if (selectedOffsets.Count > 0 && m_ProfileSingleView.inSyncWithProfilerData)
+                    JumpToFrame(m_ProfileSingleView.data.OffsetToDisplayFrame(selectedOffsets[0]), m_ProfileSingleView.data, false);
+            }
+            else
+            {
+                m_ProfileSingleView.selectedIndices.Clear();
+                foreach (int offset in selectedOffsets)
+                {
+                    m_ProfileSingleView.selectedIndices.Add(m_ProfileSingleView.data.OffsetToDisplayFrame(offset));
+                }
+                // Keep indices sorted
+                m_ProfileSingleView.selectedIndices.Sort();
+
+                m_RequestAnalysis = true;
+            }
+        }
+
+        internal void ClearSelection()
+        {
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                m_ProfileSingleView.ClearSelection();
+
+                m_RequestAnalysis = true;
+            }
+            if (m_ActiveTab == ActiveTab.Compare)
+            {
+                m_ProfileLeftView.ClearSelection();
+                m_ProfileRightView.ClearSelection();
+
+                m_RequestCompare = true;
+            }
+        }
+
+        internal void SelectAllFrames()
+        {
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                m_ProfileSingleView.SelectFullRange();
+
+                m_RequestAnalysis = true;
+            }
+            if (m_ActiveTab == ActiveTab.Compare)
+            {
+                m_ProfileLeftView.SelectFullRange();
+                m_ProfileRightView.SelectFullRange();
+
+                m_RequestCompare = true;
+            }
+        }
+
+        internal void SelectFramesContainingMarker(string markerName, bool inSelection)
+        {
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                if (m_ProfileSingleView.SelectAllFramesContainingMarker(markerName, inSelection))
+                {
+                    m_RequestAnalysis = true;
+                }
+            }
+            if (m_ActiveTab == ActiveTab.Compare)
+            {
+                if (m_ProfileLeftView.SelectAllFramesContainingMarker(markerName, inSelection))
+                {
+                    m_RequestCompare = true;
+                }
+                if (m_ProfileRightView.SelectAllFramesContainingMarker(markerName, inSelection))
+                {
+                    m_RequestCompare = true;
+                }
+            }
+        }
+
+        static List<string> GetNameFilters(string nameFilter)
+        {
+            List<string> nameFilters = new List<string>();
+            if (string.IsNullOrEmpty(nameFilter))
+                return nameFilters;
+
+            // Get all quoted strings, without the quotes
+            MatchCollection matches = quotedStringWithoutQuotes.Matches(nameFilter);
+            foreach (Match match in matches)
+            {
+                var theData = match.Groups[1].Value;
+                nameFilters.Add(theData);
+            }
+
+            // Get a new string with the quoted strings removed
+            string remaining = quotedString.Replace(nameFilter, "");
+
+            // Get all the remaining strings (that are space separated)
+            matches = stringWithoutWhiteSpace.Matches(remaining);
+            foreach (Match match in matches)
+            {
+                string theData = match.Groups[1].Value;
+                nameFilters.Add(theData);
+            }
+
+            return nameFilters;
+        }
+
+        internal List<string> GetNameFilters()
+        {
+            return GetNameFilters(m_NameFilter);
+        }
+
+        internal List<string> GetNameExcludes()
+        {
+            return GetNameFilters(m_NameExclude);
+        }
+
+        internal bool DoesMarkerPassFilter(string name)
+        {
+            return m_MarkerFilter.DoesMarkerPassFilter(this, name);
+        }
+
+        internal bool NameInIncludeList(string name, List<string> nameFilters)
+        {
+            return NameInFilterList(name, nameFilters, m_NameFilterOperation);
+        }
+
+        internal bool NameInExcludeList(string name, List<string> nameExcludes)
+        {
+            return NameInFilterList(name, nameExcludes, m_NameExcludeOperation);
+        }
+
+        static bool NameInFilterList(string name, List<string> nameFilters, NameFilterOperation operation)
+        {
+            switch (operation)
+            {
+                default:
+                //case NameFilterOperation.All:
+                {
+                    foreach (string subString in nameFilters)
+                    {
+                        // As soon as name doesn't match one in the list then return false
+                        if (name.IndexOf(subString, StringComparison.OrdinalIgnoreCase) < 0)
+                            return false;
+                    }
+
+                    // Name is matching all the filters in the list
+                    return true;
+                }
+                case NameFilterOperation.Any:
+                {
+                    foreach (string subString in nameFilters)
+                    {
+                        // As soon as names matches one in the list then return true
+                        if (name.IndexOf(subString, StringComparison.OrdinalIgnoreCase) >= 0)
+                            return true;
+                    }
+
+                    return false;
+                }
+            }
+        }
+
+        static string FilterWithQuotes(string markerName)
+        {
+            return markerName.Contains(" ") ? string.Format("\"{0}\"", markerName) : markerName;
+        }
+
+        static void AddFilter(ref string filter, string quotedMarkerName)
+        {
+            if (string.IsNullOrEmpty(filter))
+                filter = quotedMarkerName;
+            else
+                filter = string.Format("{0} {1}", filter, quotedMarkerName);
+        }
+
+        static bool AddFilter(List<string> nameFilters, ref string filter, string markerName)
+        {
+            bool justAdded = false;
+
+            string quotedMarkerName = FilterWithQuotes(markerName);
+            if (!nameFilters.Contains(quotedMarkerName))
+            {
+                AddFilter(ref filter, quotedMarkerName);
+
+                justAdded = true;
+            }
+
+            return justAdded;
+        }
+
+        internal void AddToIncludeFilter(string markerName)
+        {
+            if (AddFilter(GetNameFilters(), ref m_NameFilter, markerName))
+            {
+                m_MarkerFilter.Clear();
+                UpdateMarkerTable();
+            }
+
+            // Remove from exclude list if in the include list
+            RemoveFromExcludeFilter(markerName);
+        }
+
+        internal void AddToExcludeFilter(string markerName)
+        {
+            if (AddFilter(GetNameExcludes(), ref m_NameExclude, markerName))
+            {
+                m_MarkerFilter.Clear();
+                UpdateMarkerTable();
+            }
+
+            // Remove from include list if in the include list
+            RemoveFromIncludeFilter(markerName);
+        }
+
+        internal void RemoveFromFilter(string markerName, List<string> nameFilters, ref string newFilters)
+        {
+            if (nameFilters.Count == 0)
+                return;
+
+            string nameFilterString = "";
+            bool updated = false;
+            foreach (string filter in nameFilters)
+            {
+                if (string.Compare(filter, markerName, StringComparison.CurrentCultureIgnoreCase) != 0)
+                    AddFilter(ref nameFilterString, FilterWithQuotes(filter));
+                else
+                    updated = true;
+            }
+
+            if (updated)
+            {
+                newFilters = nameFilterString;
+
+                m_MarkerFilter.Clear();
+                UpdateMarkerTable();
+            }
+        }
+
+        internal void RemoveFromIncludeFilter(string markerName)
+        {
+            RemoveFromFilter(markerName, GetNameFilters(), ref m_NameFilter);
+        }
+
+        internal void RemoveFromExcludeFilter(string markerName)
+        {
+            RemoveFromFilter(markerName, GetNameExcludes(), ref m_NameExclude);
+        }
+
+        internal void SetAsParentMarkerFilter(string markerName)
+        {
+            if (markerName != m_ParentMarker)
+            {
+                m_ParentMarker = markerName;
+                UpdateActiveTab(true);
+            }
+        }
+
+        float GetFilenameWidth(string path)
+        {
+            if (path == null)
+                return 0f;
+
+            string filename = System.IO.Path.GetFileName(path);
+            GUIContent content = new GUIContent(filename, path);
+            Vector2 size = GUI.skin.label.CalcSize(content);
+            return size.x;
+        }
+
+        void ShowFilename(string path)
+        {
+            if (path != null)
+            {
+                string filename = System.IO.Path.GetFileNameWithoutExtension(path);
+                GUIContent content = new GUIContent(filename, path);
+                Vector2 size = GUI.skin.label.CalcSize(content);
+                float width = Math.Min(size.x, 200f);
+                EditorGUILayout.LabelField(content, GUILayout.MaxWidth(width));
+            }
+        }
+
+        void DrawLoadSave()
+        {
+            EditorGUILayout.BeginHorizontal(GUILayout.MaxWidth(300), GUILayout.ExpandWidth(false));
+
+            GUIStyle buttonStyle = GUI.skin.button;
+            bool lastEnabled = GUI.enabled;
+            bool isAnalysisRunning = IsAnalysisRunning();
+            GUI.enabled = !isAnalysisRunning;
+            if (GUILayout.Button("Load", buttonStyle, GUILayout.ExpandWidth(false), GUILayout.Width(50)))
+                Load();
+            GUI.enabled = !isAnalysisRunning && (m_ProfileSingleView.IsDataValid());
+            if (GUILayout.Button("Save", buttonStyle, GUILayout.ExpandWidth(false), GUILayout.Width(50)))
+                Save(m_ProfileSingleView);
+            GUI.enabled = lastEnabled;
+
+            ShowFilename(m_ProfileSingleView.path);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        bool IsSelectedMarkerValid()
+        {
+            bool valid = true;
+
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                if (IsAnalysisValid())
+                {
+                    valid = false;
+
+                    List<MarkerData> markers = m_ProfileSingleView.analysis.GetMarkers();
+                    if (markers != null)
+                    {
+                        int markerAt = m_SelectedMarker.id;
+                        if (markerAt >= 0 && markerAt < markers.Count)
+                        {
+                            valid = true;
+                        }
+                    }
+                }
+            }
+            else if (m_ActiveTab == ActiveTab.Compare)
+            {
+                if (IsAnalysisValid())
+                {
+                    valid = false;
+
+                    List<MarkerData> leftMarkers = m_ProfileLeftView.analysis.GetMarkers();
+                    List<MarkerData> rightMarkers = m_ProfileRightView.analysis.GetMarkers();
+                    int pairingAt = m_SelectedPairing;
+                    if (leftMarkers != null && rightMarkers != null && m_Pairings != null)
+                    {
+                        if (pairingAt >= 0 && pairingAt < m_Pairings.Count)
+                        {
+                            valid = true;
+                        }
+                    }
+                }
+            }
+
+            return valid;
+        }
+
+        void ShowSelectedMarker()
+        {
+            bool valid = IsSelectedMarkerValid();
+
+            if (valid)
+            {
+                DrawSelectedText(m_SelectedMarker.name);
+            }
+            else
+            {
+                var markerInThread = m_SelectedMarker.id == -1 && !string.IsNullOrEmpty(m_SelectedMarker.threadName);
+                var threadText = markerInThread ?
+                    string.Format(" (Selected in: {0}{1}{2})",
+                    m_SelectedMarker.threadGroupName,
+                    string.IsNullOrEmpty(m_SelectedMarker.threadGroupName) ? "" : ".",
+                    m_SelectedMarker.threadName) :
+                    null;
+                string text = string.Format("{0}{1} not in selection", m_SelectedMarker.name, threadText);
+
+                GUIContent content = new GUIContent(text, text);
+                Vector2 size = GUI.skin.label.CalcSize(content);
+                Rect rect = EditorGUILayout.GetControlRect(GUILayout.MaxWidth(size.x), GUILayout.Height(size.y));
+                if (Event.current.type == EventType.Repaint)
+                {
+                    GUI.Label(rect, content);
+                }
+            }
+        }
+
+        internal bool AllSelected()
+        {
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                if (m_ProfileSingleView.AllSelected())
+                    return true;
+            }
+            if (m_ActiveTab == ActiveTab.Compare)
+            {
+                if (m_ProfileLeftView.AllSelected() && m_ProfileRightView.AllSelected())
+                    return true;
+            }
+
+            return false;
+        }
+
+        internal bool HasSelection()
+        {
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                if (m_ProfileSingleView.HasSelection())
+                    return true;
+            }
+            if (m_ActiveTab == ActiveTab.Compare)
+            {
+                if (m_ProfileLeftView.HasSelection())
+                    return true;
+                if (m_ProfileRightView.HasSelection())
+                    return true;
+            }
+
+            return false;
+        }
+
+        internal int GetRemappedUIFrameIndex(int frameIndex, ProfileDataView context)
+        {
+            if (context.inSyncWithProfilerData)
+                return RemapFrameIndex(frameIndex, context.data.FrameIndexOffset);
+            else
+                return k_ProfileDataDefaultDisplayOffset + context.data.DisplayFrameToOffset(frameIndex);
+        }
+
+        internal bool CanExportComparisonTable()
+        {
+            return m_ProfileLeftView != null && m_ProfileLeftView.IsDataValid() && m_ProfileRightView != null && m_ProfileRightView.IsDataValid() &&
+                m_ComparisonTable != null && m_ActiveTab == ActiveTab.Compare;
+        }
+
+        internal bool TryExportComparisonTable(StreamWriter writer)
+        {
+            if (m_ComparisonTable == null || m_ActiveTab != ActiveTab.Compare)
+                return false;
+            m_ComparisonTable.WriteTableContentsCSV(writer);
+            return true;
+        }
+
+        int GetRemappedUIFirstFrameOffset(ProfileDataView context)
+        {
+            if (context.inSyncWithProfilerData)
+                return RemapFrameIndex(context.data.OffsetToDisplayFrame(0), context.data.FrameIndexOffset);
+            else
+                return context.data.OffsetToDisplayFrame(0);
+        }
+
+        int GetRemappedUIFirstFrameDisplayOffset(ProfileDataView context)
+        {
+            if (context.inSyncWithProfilerData)
+                return RemapFrameIndex(context.data.OffsetToDisplayFrame(0), context.data.FrameIndexOffset);
+            else
+                return k_ProfileDataDefaultDisplayOffset;
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawFrameTimeGraphProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawFrameTimeGraph");
+
+        void DrawFrameTimeGraph(float height)
+        {
+            using (m_DrawFrameTimeGraphProfilerMarker.Auto())
+            {
+                GUI.SetNextControlName("FrameTimeGraph");
+                Rect rect = EditorGUILayout.GetControlRect(GUILayout.Height(height));
+
+                if (m_ProfileSingleView.IsDataValid())
+                {
+                    if (!m_FrameTimeGraph.HasData())
+                        m_FrameTimeGraph.SetData(GetFrameTimeData(m_ProfileSingleView.data));
+                    if (!m_ProfileSingleView.HasValidSelection())
+                        m_ProfileSingleView.SelectFullRange();
+
+
+                    List<int> selectedOffsets = new List<int>();
+                    foreach (int index in m_ProfileSingleView.selectedIndices)
+                    {
+                        selectedOffsets.Add(m_ProfileSingleView.data.DisplayFrameToOffset(index));
+                    }
+
+                    float yRange = m_FrameTimeGraph.GetDataRange();
+                    int offsetToDisplayMapping = GetRemappedUIFirstFrameDisplayOffset(m_ProfileSingleView);
+                    int offsetToIndexMapping = GetRemappedUIFirstFrameOffset(m_ProfileSingleView);
+                    bool enabled = !IsAnalysisRunning();
+                    m_FrameTimeGraph.SetEnabled(enabled);
+
+                    bool valid = IsSelectedMarkerValid();
+                    string validMarkerName = valid ? m_SelectedMarker.name : "";
+
+                    m_FrameTimeGraph.Draw(rect, m_ProfileSingleView.analysis, selectedOffsets, yRange, offsetToDisplayMapping, offsetToIndexMapping,
+                        validMarkerName, 0, m_ProfileSingleView.analysisFull);
+
+                    EditorGUILayout.BeginHorizontal();
+
+                    GUILayout.FlexibleSpace();
+                    ShowSelectedMarker();
+                    EditorGUILayout.EndHorizontal();
+                }
+                else
+                {
+                    GUI.Label(rect, Styles.dataMissing, m_StyleUpperLeft);
+                }
+            }
+        }
+
+        void DrawParentFilter()
+        {
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(Styles.parentMarker, GUILayout.Width(100));
+
+            if (!string.IsNullOrEmpty(m_ParentMarker))
+            {
+                bool lastEnabled = GUI.enabled;
+                bool enabled = !IsAnalysisRunning();
+                GUI.enabled = enabled;
+                if (GUILayout.Button("Clear", EditorStyles.miniButton, GUILayout.MaxWidth(LayoutSize.FilterOptionsEnumWidth)))
+                {
+                    SetAsParentMarkerFilter("");
+                }
+                GUI.enabled = lastEnabled;
+
+                DrawSelectedText(m_ParentMarker);
+            }
+            else
+            {
+                EditorGUILayout.LabelField(Styles.selectParentMarker);
+            }
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        internal void SetThreadSelection(ThreadSelection threadSelection)
+        {
+            m_ThreadSelectionNew = new ThreadSelection(threadSelection);
+
+            UpdateActiveTab(true);
+        }
+
+        string CalculateSelectedThreadsSummary()
+        {
+            if (m_ThreadSelection.selection == null || m_ThreadSelection.selection.Count == 0)
+                return "None";
+
+            // Count all threads in a group
+            var threadDict = new Dictionary<string, int>();
+            var threadSelectionDict = new Dictionary<string, int>();
+            foreach (var threadNameWithIndex in m_ThreadNames)
+            {
+                var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                if (threadIdentifier.index == ThreadIdentifier.kAll)
+                    continue;
+
+                int count;
+                if (threadDict.TryGetValue(threadIdentifier.name, out count))
+                    threadDict[threadIdentifier.name] = count + 1;
+                else
+                    threadDict[threadIdentifier.name] = 1;
+
+                threadSelectionDict[threadIdentifier.name] = 0;
+            }
+
+            // Count all the threads we have 'selected' in a group
+            foreach (var threadNameWithIndex in m_ThreadSelection.selection)
+            {
+                var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+
+                if (threadDict.ContainsKey(threadIdentifier.name) &&
+                    threadSelectionDict.ContainsKey(threadIdentifier.name) &&
+                    threadIdentifier.index <= threadDict[threadIdentifier.name])
+                {
+                    // Selected thread valid and in the thread list
+                    // and also within the range of valid threads for this data set
+                    threadSelectionDict[threadIdentifier.name]++;
+                }
+            }
+
+            // Count all thread groups where we have 'selected all the threads'
+            int threadsSelected = 0;
+            foreach (var threadName in threadDict.Keys)
+            {
+                if (threadSelectionDict[threadName] != threadDict[threadName])
+                    continue;
+
+                threadsSelected++;
+            }
+
+            // If we've just added all the thread names we have everything selected
+            // Note we don't compare against the m_ThreadNames directly as this contains the 'all' versions
+            if (threadsSelected == threadDict.Keys.Count)
+                return "All";
+
+            // Add all the individual threads were we haven't already added the group
+            List<string> threads = new List<string>();
+            foreach (var threadName in threadSelectionDict.Keys)
+            {
+                int selectionCount = threadSelectionDict[threadName];
+                if (selectionCount <= 0)
+                    continue;
+                int threadCount = threadDict[threadName];
+                if (threadCount == 1)
+                    threads.Add(threadName);
+                else if (selectionCount != threadCount)
+                    threads.Add(string.Format("{0} ({1} of {2})", threadName, selectionCount, threadCount));
+                else
+                    threads.Add(string.Format("{0} (All)", threadName));
+            }
+
+            // Maintain alphabetical order
+            threads.Sort(CompareUINames);
+
+            if (threads.Count == 0)
+                return "None";
+
+            string threadsSelectedText = string.Join(", ", threads.ToArray());
+            return threadsSelectedText;
+        }
+
+        string GetSelectedThreadsSummary()
+        {
+            return m_ThreadSelectionSummary;
+        }
+
+        void DrawThreadFilter(ProfileData profileData)
+        {
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(Styles.threadFilter, GUILayout.Width(LayoutSize.FilterOptionsLeftLabelWidth));
+            if (profileData != null)
+            {
+                if (m_ThreadNames.Count > 0)
+                {
+                    bool lastEnabled = GUI.enabled;
+                    bool enabled = !IsAnalysisRunning() && !ThreadSelectionWindow.IsOpen();
+                    GUI.enabled = enabled;
+                    if (GUILayout.Button(Styles.threadFilterSelect, GUILayout.Width(LayoutSize.FilterOptionsEnumWidth)))
+                    {
+                        Vector2 windowPosition = new Vector2(Event.current.mousePosition.x + LayoutSize.FilterOptionsEnumWidth, Event.current.mousePosition.y + GUI.skin.label.lineHeight);
+                        Vector2 screenPosition = GUIUtility.GUIToScreenPoint(windowPosition);
+
+                        ThreadSelectionWindow.Open(screenPosition.x, screenPosition.y, this, m_ThreadSelection, m_ThreadNames, m_ThreadUINames);
+                        EditorGUIUtility.ExitGUI();
+                    }
+
+                    GUI.enabled = lastEnabled;
+                    ShowSelectedThreads();
+                    GUILayout.FlexibleSpace();
+                }
+            }
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void DrawSelectedText(string text)
+        {
+            if (text == null)
+                return;
+
+            GUIStyle treeViewSelectionStyle = "TV Selection";
+            GUIStyle backgroundStyle = new GUIStyle(treeViewSelectionStyle);
+
+            GUIStyle treeViewLineStyle = "TV Line";
+            GUIStyle textStyle = new GUIStyle(treeViewLineStyle);
+
+            GUIContent content = new GUIContent(text, text);
+            Vector2 size = textStyle.CalcSize(content);
+            Rect rect = EditorGUILayout.GetControlRect(GUILayout.MaxWidth(size.x), GUILayout.Height(size.y));
+            if (Event.current.type == EventType.Repaint)
+            {
+                backgroundStyle.Draw(rect, false, false, true, true);
+                GUI.Label(rect, content, textStyle);
+            }
+        }
+
+        void ShowSelectedThreads()
+        {
+            string threadsSelected = GetSelectedThreadsSummary();
+
+            DrawSelectedText(threadsSelected);
+        }
+
+        void DrawUnitFilter()
+        {
+            EditorGUILayout.BeginHorizontal(GUILayout.Width(LayoutSize.FilterOptionsRightLabelWidth + LayoutSize.FilterOptionsRightEnumWidth));
+            EditorGUILayout.LabelField(Styles.unitFilter, m_StyleMiddleRight, GUILayout.Width(LayoutSize.FilterOptionsRightEnumWidth));
+
+            bool lastEnabled = GUI.enabled;
+            bool enabled = !IsAnalysisRunning();
+            GUI.enabled = enabled;
+            //Units units = (Units)EditorGUILayout.EnumPopup(m_DisplayUnits.Units, GUILayout.Width(LayoutSize.FilterOptionsRightEnumWidth));
+            Units units = (Units)EditorGUILayout.Popup((int)m_DisplayUnits.Units, m_UnitNames, GUILayout.Width(LayoutSize.FilterOptionsRightEnumWidth));
+
+            GUI.enabled = lastEnabled;
+            if (units != m_DisplayUnits.Units)
+            {
+                SetUnits(units);
+                m_FrameTimeGraph.SetUnits(m_DisplayUnits.Units);
+                m_LeftFrameTimeGraph.SetUnits(m_DisplayUnits.Units);
+                m_RightFrameTimeGraph.SetUnits(m_DisplayUnits.Units);
+                UpdateMarkerTable();
+            }
+            EditorGUILayout.EndHorizontal();
+        }
+
+        bool IsSelfTime()
+        {
+            return (m_TimingOption == TimingOptions.TimingOption.Self) ? true : false;
+        }
+
+        void DrawTimingFilter()
+        {
+            EditorGUILayout.BeginHorizontal(GUILayout.Width(LayoutSize.FilterOptionsRightLabelWidth + LayoutSize.FilterOptionsRightEnumWidth));
+
+            EditorGUILayout.LabelField(Styles.timingFilter, m_StyleMiddleRight, GUILayout.Width(LayoutSize.FilterOptionsRightLabelWidth));
+
+            bool lastEnabled = GUI.enabled;
+            bool enabled = !IsAnalysisRunning();
+            GUI.enabled = enabled;
+            var timingOption = (TimingOptions.TimingOption)EditorGUILayout.Popup((int)m_TimingOption, TimingOptions.TimingOptionNames, GUILayout.Width(LayoutSize.FilterOptionsRightEnumWidth));
+            GUI.enabled = lastEnabled;
+            if (timingOption != m_TimingOption)
+            {
+                m_TimingOption = timingOption;
+                UpdateActiveTab(true, true);
+            }
+            EditorGUILayout.EndHorizontal();
+        }
+
+        internal string GetDisplayUnits()
+        {
+            return m_DisplayUnits.Postfix();
+        }
+
+        internal string ToDisplayUnits(float ms, bool showUnits = false, int limitToDigits = 5, bool showFullValueWhenBelowZero = false)
+        {
+            return m_DisplayUnits.ToString(ms, showUnits, limitToDigits, showFullValueWhenBelowZero);
+        }
+
+        internal string ToDisplayUnits(double ms, bool showUnits = false, int limitToDigits = 5, bool showFullValueWhenBelowZero = false)
+        {
+            return m_DisplayUnits.ToString((float)ms, showUnits, limitToDigits, showFullValueWhenBelowZero);
+        }
+
+        internal string ToTooltipDisplayUnits(float ms, bool showUnits = false, int frameIndex = -1)
+        {
+            return m_DisplayUnits.ToTooltipString(ms, showUnits, frameIndex);
+        }
+
+        internal GUIContent ToDisplayUnitsWithTooltips(float ms, bool showUnits = false, int frameIndex = -1)
+        {
+            return m_DisplayUnits.ToGUIContentWithTooltips(ms, showUnits, 5, frameIndex);
+        }
+
+        void SetUnits(Units units)
+        {
+            m_DisplayUnits = new DisplayUnits(units);
+        }
+
+        void UpdateActiveTab(bool fullAnalysisRequired = false, bool markOtherDirty = true)
+        {
+            switch (m_ActiveTab)
+            {
+                case ActiveTab.Summary:
+                    m_RequestAnalysis = true;
+                    m_FullAnalysisRequired = fullAnalysisRequired;
+                    break;
+                case ActiveTab.Compare:
+                    m_RequestCompare = true;
+                    m_FullCompareRequired = fullAnalysisRequired;
+                    break;
+            }
+
+            if (markOtherDirty)
+                m_OtherTabDirty = true;
+        }
+
+        void UpdateMarkerTable(bool markOtherDirty = true)
+        {
+            switch (m_ActiveTab)
+            {
+                case ActiveTab.Summary:
+                    if (m_ProfileTable != null)
+                        m_ProfileTable.Reload();
+                    break;
+                case ActiveTab.Compare:
+                    if (m_ComparisonTable != null)
+                        m_ComparisonTable.Reload();
+                    break;
+            }
+
+            if (markOtherDirty)
+                m_OtherTableDirty = true;
+        }
+
+        void DrawNameFilter()
+        {
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(Styles.nameFilter, GUILayout.Width(LayoutSize.FilterOptionsLeftLabelWidth));
+
+            NameFilterOperation lastNameFilterOperation = m_NameFilterOperation;
+
+            bool lastEnabled = GUI.enabled;
+            bool enabled = !IsAnalysisRunning();
+            GUI.enabled = enabled;
+            m_NameFilterOperation = (NameFilterOperation)EditorGUILayout.Popup((int)m_NameFilterOperation, Styles.nameFilterOperation, GUILayout.MaxWidth(LayoutSize.FilterOptionsEnumWidth));
+            GUI.enabled = lastEnabled;
+
+            if (m_NameFilterOperation != lastNameFilterOperation)
+            {
+                m_MarkerFilter.Clear();
+                UpdateMarkerTable();
+            }
+            string lastFilter = m_NameFilter;
+            GUI.enabled = enabled;
+            GUI.SetNextControlName("NameFilter");
+            m_NameFilter = EditorGUILayout.TextField(m_NameFilter, GUILayout.MinWidth(200 - LayoutSize.FilterOptionsEnumWidth));
+            GUI.enabled = lastEnabled;
+            if (m_NameFilter != lastFilter)
+            {
+                m_MarkerFilter.Clear();
+                UpdateMarkerTable();
+            }
+
+            EditorGUILayout.LabelField(Styles.nameExclude, GUILayout.Width(LayoutSize.FilterOptionsLeftLabelWidth));
+            NameFilterOperation lastNameExcludeOperation = m_NameExcludeOperation;
+            GUI.enabled = enabled;
+            m_NameExcludeOperation = (NameFilterOperation)EditorGUILayout.Popup((int)m_NameExcludeOperation, Styles.nameFilterOperation, GUILayout.MaxWidth(LayoutSize.FilterOptionsEnumWidth));
+            GUI.enabled = lastEnabled;
+            if (m_NameExcludeOperation != lastNameExcludeOperation)
+            {
+                m_MarkerFilter.Clear();
+                UpdateMarkerTable();
+            }
+            string lastExclude = m_NameExclude;
+            GUI.enabled = enabled;
+            GUI.SetNextControlName("ExcludeFilter");
+            m_NameExclude = EditorGUILayout.TextField(m_NameExclude, GUILayout.MinWidth(200 - LayoutSize.FilterOptionsEnumWidth));
+            GUI.enabled = lastEnabled;
+            if (m_NameExclude != lastExclude)
+            {
+                m_MarkerFilter.Clear();
+                UpdateMarkerTable();
+            }
+            EditorGUILayout.EndHorizontal();
+        }
+
+        internal void SetMode(MarkerColumnFilter.Mode newMode)
+        {
+            m_SingleModeFilter.mode = newMode;
+            m_CompareModeFilter.mode = newMode;
+
+            if (m_ProfileTable != null)
+                m_ProfileTable.SetMode(m_SingleModeFilter);
+            if (m_ComparisonTable != null)
+                m_ComparisonTable.SetMode(m_CompareModeFilter);
+        }
+
+        internal void SetSingleModeColumns(int[] visibleColumns)
+        {
+            // If selecting the columns manually then override the currently stored selection with the current
+            m_ProfileMulticolumnHeaderState.visibleColumns = visibleColumns;
+
+            m_SingleModeFilter.mode = MarkerColumnFilter.Mode.Custom;
+            m_SingleModeFilter.visibleColumns = visibleColumns;
+        }
+
+        internal void SetComparisonModeColumns(int[] visibleColumns)
+        {
+            // If selecting the columns manually then override the currently stored selection with the current
+            m_ComparisonMulticolumnHeaderState.visibleColumns = visibleColumns;
+
+            m_CompareModeFilter.mode = MarkerColumnFilter.Mode.Custom;
+            m_CompareModeFilter.visibleColumns = visibleColumns;
+        }
+
+        void DrawMarkerColumnFilter()
+        {
+            EditorGUILayout.BeginHorizontal(GUILayout.Width(LayoutSize.FilterOptionsRightLabelWidth + LayoutSize.FilterOptionsRightEnumWidth));
+            EditorGUILayout.LabelField(Styles.markerColumns, m_StyleMiddleRight, GUILayout.Width(LayoutSize.FilterOptionsRightLabelWidth));
+
+            bool lastEnabled = GUI.enabled;
+            bool enabled = !IsAnalysisRunning();
+            GUI.enabled = enabled;
+
+            var filterMode = m_ActiveTab == ActiveTab.Summary ? m_SingleModeFilter : m_CompareModeFilter;
+
+            var oldMode = filterMode.mode;
+            filterMode.mode = (MarkerColumnFilter.Mode)EditorGUILayout.IntPopup((int)filterMode.mode, MarkerColumnFilter.ModeNames, MarkerColumnFilter.ModeValues, GUILayout.Width(LayoutSize.FilterOptionsRightEnumWidth));
+            if (filterMode.mode != oldMode)
+            {
+                if (m_ActiveTab == ActiveTab.Summary && m_ProfileTable != null)
+                    m_ProfileTable.SetMode(filterMode);
+                else if (m_ActiveTab == ActiveTab.Compare && m_ComparisonTable != null)
+                    m_ComparisonTable.SetMode(filterMode);
+            }
+
+            GUI.enabled = lastEnabled;
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        enum InDataSet
+        {
+            Left,
+            Both,
+            Right
+        };
+
+        int GetCombinedThreadCount(out int matchingCount, out int uniqueLeft, out int uniqueRight)
+        {
+            var threads = new Dictionary<string, InDataSet>();
+            foreach (var threadName in m_ProfileLeftView.data.GetThreadNames())
+            {
+                threads[threadName] = InDataSet.Left;
+            }
+            foreach (var threadName in m_ProfileRightView.data.GetThreadNames())
+            {
+                if (threads.ContainsKey(threadName))
+                    threads[threadName] = InDataSet.Both;
+                else
+                    threads[threadName] = InDataSet.Right;
+            }
+
+            matchingCount = 0;
+            uniqueLeft = 0;
+            uniqueRight = 0;
+            int total = 0;
+            foreach (var thread in threads)
+            {
+                switch (thread.Value)
+                {
+                    case InDataSet.Left:
+                        uniqueLeft++;
+                        break;
+                    case InDataSet.Both:
+                        matchingCount++;
+                        break;
+                    case InDataSet.Right:
+                        uniqueRight++;
+                        break;
+                }
+                total++;
+            }
+
+            return total;
+        }
+
+        void DrawMarkerCount()
+        {
+            if (!IsAnalysisValid())
+                return;
+
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                int markersCount = m_ProfileSingleView.analysis.GetFrameSummary().totalMarkers;
+                int filteredMarkersCount = (m_ProfileTable != null) ? m_ProfileTable.GetRows().Count : 0;
+
+                var content = new GUIContent(
+                    String.Format("{0} of {1} markers", filteredMarkersCount, markersCount),
+                    "Number of markers in the filtered set, compared to the total in the data set");
+                Vector2 size = GUI.skin.label.CalcSize(content);
+                Rect rect = EditorGUILayout.GetControlRect(GUILayout.Width(size.x), GUILayout.Height(size.y));
+                EditorGUI.LabelField(rect, content);
+            }
+            if (m_ActiveTab == ActiveTab.Compare)
+            {
+                int markersCount = m_TotalCombinedMarkerCount;
+                int filteredMarkersCount = (m_ComparisonTable != null) ? m_ComparisonTable.GetRows().Count : 0;
+
+                var content = new GUIContent(
+                    String.Format("{0} of {1} markers", filteredMarkersCount, markersCount),
+                    "Number of markers in the filtered set, compared to total unique markers in the combined data sets");
+                Vector2 size = GUI.skin.label.CalcSize(content);
+                Rect rect = EditorGUILayout.GetControlRect(GUILayout.Width(size.x), GUILayout.Height(size.y));
+                EditorGUI.LabelField(rect, content);
+            }
+        }
+
+        string GetThreadCountToolTipUnion(int allThreadsCount, int matchingCount)
+        {
+            return String.Format(
+                "Total\n{0} Union : Combined over both data sets\n{1} Intersection : Matching in both data sets",
+                allThreadsCount,
+                matchingCount
+            );
+        }
+
+        string GetThreadCountToolTipDifference(int allThreadsCount, int matchingCount, int uniqueLeft, int uniqueRight)
+        {
+            return String.Format(
+                "Difference\n{0}\n{1} Unique to left\n{2} Unique to right",
+                allThreadsCount - matchingCount,
+                uniqueLeft,
+                uniqueRight);
+        }
+
+        string GetThreadCountToolTip(int allThreadsCount, int matchingCount, int uniqueLeft, int uniqueRight)
+        {
+            return String.Format(
+                "{0}\n\n{1}",
+                GetThreadCountToolTipUnion(allThreadsCount, matchingCount),
+                GetThreadCountToolTipDifference(allThreadsCount, matchingCount, uniqueLeft, uniqueRight)
+            );
+        }
+
+        void DrawThreadCount()
+        {
+            if (!IsAnalysisValid())
+                return;
+
+            if (m_ActiveTab == ActiveTab.Summary)
+            {
+                int allThreadsCount = m_ProfileSingleView.data.GetThreadNames().Count;
+                List<string> threadSelection = GetLimitedThreadSelection(m_ThreadNames, m_ThreadSelection);
+                int selectedThreads = threadSelection.Count;
+
+                var content = new GUIContent(
+                    String.Format("{0} of {1} threads", selectedThreads, allThreadsCount),
+                    "Number of threads in the filtered set, compared to the total in the data set");
+                Vector2 size = GUI.skin.label.CalcSize(content);
+                Rect rect = EditorGUILayout.GetControlRect(GUILayout.Width(size.x), GUILayout.Height(size.y));
+                EditorGUI.LabelField(rect, content);
+            }
+            if (m_ActiveTab == ActiveTab.Compare)
+            {
+                int matchingCount, uniqueLeft, uniqueRight;
+                int allThreadsCount = GetCombinedThreadCount(out matchingCount, out uniqueLeft, out uniqueRight);
+                List<string> threadSelection = GetLimitedThreadSelection(m_ThreadNames, m_ThreadSelection);
+                int selectedThreads = threadSelection.Count;
+
+                string partialTooltip = GetThreadCountToolTip(allThreadsCount, matchingCount, uniqueLeft, uniqueRight);
+
+                var content = new GUIContent(
+                    String.Format("{0} of {1} threads", selectedThreads, allThreadsCount),
+                    String.Format("Number of threads in the filtered set, compared to total unique threads in the combined data sets\n\n{0}", partialTooltip)
+                );
+                Vector2 size = GUI.skin.label.CalcSize(content);
+                Rect rect = EditorGUILayout.GetControlRect(GUILayout.Width(size.x), GUILayout.Height(size.y));
+                EditorGUI.LabelField(rect, content);
+            }
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawAnalysisOptionsProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawAnalysisOptions");
+
+        void UpdateRemoveMarkerDisplay()
+        {
+            UpdateActiveTab(true);
+            // Force an update
+            m_FrameTimeGraph.ClearData();
+            m_LeftFrameTimeGraph.ClearData();
+            m_RightFrameTimeGraph.ClearData();
+        }
+
+        void BuildRemoveMarkerList()
+        {
+            var entries = new List<GUIContent>();
+            var values = new List<int>();
+            m_removeMarkerSomeMissing = false;
+            foreach (RemoveMarkerOperation filterOperation in Enum.GetValues(typeof(RemoveMarkerOperation)))
+            {
+                int value = (int)filterOperation;
+                GUIContent entry = new GUIContent(Styles.removeMarkerOperation[value]);
+
+                bool found = true;
+                switch(filterOperation)
+                {
+                    case RemoveMarkerOperation.HideWaitForFPS:
+                        {
+                            switch (m_ActiveTab)
+                            {
+                                case ActiveTab.Summary:
+                                    if (!m_ProfileSingleView.containsWaitForFPS)
+                                        found = false;
+                                    break;
+                                case ActiveTab.Compare:
+                                    if (!m_ProfileLeftView.containsWaitForFPS && !m_ProfileRightView.containsWaitForFPS)
+                                        found = false;
+                                    break;
+                            }
+                        }
+                        break;
+                    case RemoveMarkerOperation.HideWaitForPresent:
+                        {
+                            switch (m_ActiveTab)
+                            {
+                                case ActiveTab.Summary:
+                                    if (!m_ProfileSingleView.containsWaitForPresent)
+                                        found = false;
+                                    break;
+                                case ActiveTab.Compare:
+                                    if (!m_ProfileLeftView.containsWaitForPresent && !m_ProfileRightView.containsWaitForPresent)
+                                        found = false;
+                                    break;
+                            }
+                        }
+                        break;
+                }
+
+                if (!found)
+                {
+                    entry.text += " (not in capture)";
+                    m_removeMarkerSomeMissing = true;
+                }
+                entries.Add(entry);
+                values.Add(value);
+            }
+
+            m_removeMarkerDisplay = entries.ToArray();
+            m_removeMarkerValues = values.ToArray();
+        }
+
+
+        void DrawRemoveMarker()
+        {
+            bool update = false;
+
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField(Styles.removeMarker, GUILayout.Width(LayoutSize.FilterOptionsLeftLabelWidth));
+
+            bool lastEnabled = GUI.enabled;
+            bool enabled = !IsAnalysisRunning();
+            GUI.enabled = enabled;
+
+            if (m_removeMarkerDisplay == null || m_removeMarkerValues == null)
+                BuildRemoveMarkerList();
+
+            // Hack to make popup wider if some markers missing, and have extra text to indicate that
+            int width = (m_removeMarkerSomeMissing ? LayoutSize.RemoveMarkerMissingOptionsEnumWidth : LayoutSize.RemoveMarkerOptionsEnumWidth);
+            RemoveMarkerOperation removeMarkerOperation = (RemoveMarkerOperation)EditorGUILayout.IntPopup((int)m_removeMarkerOperation, m_removeMarkerDisplay, m_removeMarkerValues, GUILayout.Width(width));
+            if (removeMarkerOperation != m_removeMarkerOperation)
+                update = true;
+
+            if (m_removeMarkerOperation != RemoveMarkerOperation.ShowAll)
+            {
+                bool hide = EditorGUILayout.Toggle(Styles.hideRemoveMarkers, m_hideRemovedMarkers, GUILayout.ExpandWidth(false));
+                if (hide != m_hideRemovedMarkers)
+                {
+                    m_hideRemovedMarkers = hide;
+                    update = true;
+                }
+            }
+
+            switch (m_removeMarkerOperation)
+            {
+                case RemoveMarkerOperation.ShowAll:
+                    EditorGUILayout.LabelField("");
+                    break;
+/*
+                // Could make custom marker editable, but we don't support multiple markers yet
+                // So currently we limit this to being set by right click context menu
+                case removeMarkerOperation.Custom:
+                    string removeMarkerCustomRemoveMarker = EditorGUILayout.DelayedTextField(m_removeMarkerCustomRemoveMarker, GUILayout.MinWidth(200 - LayoutSize.removeMarkerOptionsEnumWidth));
+                    if (removeMarkerCustomRemoveMarker != m_removeMarkerCustomRemoveMarker)
+                    {
+                        m_removeMarkerCustomRemoveMarker = removeMarkerCustomRemoveMarker;
+                        update = true;
+                    }
+                    break;
+*/
+                default:
+                    EditorGUILayout.LabelField(GetRemoveMarker());
+                    break;
+            }
+            GUI.enabled = lastEnabled;
+            EditorGUILayout.EndHorizontal();
+
+            if (update)
+            {
+                m_removeMarkerOperation = removeMarkerOperation;
+                UpdateRemoveMarkerDisplay();
+            }
+        }
+
+        internal void SetAsRemoveMarker(string markerName)
+        {
+            if (markerName == "")
+            {
+                if (m_removeMarkerOperation != RemoveMarkerOperation.ShowAll)
+                {
+                    m_removeMarkerOperation = RemoveMarkerOperation.ShowAll;
+                    UpdateRemoveMarkerDisplay();
+                }
+            }
+            else
+            {
+                m_hideRemovedMarkers = true;
+                m_removeMarkerCustomRemoveMarker = markerName;
+                m_removeMarkerOperation = RemoveMarkerOperation.Custom;
+                UpdateRemoveMarkerDisplay();
+            }
+        }
+
+        string GetRemoveMarker()
+        {
+            switch (m_removeMarkerOperation)
+            {
+                default:
+                case RemoveMarkerOperation.ShowAll:
+                    return null;
+                case RemoveMarkerOperation.HideWaitForFPS:
+                    // Gfx.WaitForPresentOnGfxThread is not always present on Android
+                    // E.g. when Application.targetFrameRate locks the frame rate
+                    // So we support removing WaitForTargetFPS
+                    // Often WaitForTargetFPS will be negligable on console and Gfx.WaitForPresentOnGfxThread is key
+                    return "WaitForTargetFPS";
+                case RemoveMarkerOperation.HideWaitForPresent:
+                    // Gfx.WaitForPresentOnGfxThread is seen on consoles
+                    return "Gfx.WaitForPresentOnGfxThread";
+                case RemoveMarkerOperation.Custom:
+                    if (m_removeMarkerCustomRemoveMarker == null || m_removeMarkerCustomRemoveMarker=="")
+                        m_removeMarkerCustomRemoveMarker = "WaitForTargetFPS";
+                    return m_removeMarkerCustomRemoveMarker;
+            }
+        }
+
+        void DrawAnalysisOptions()
+        {
+            using (m_DrawAnalysisOptionsProfilerMarker.Auto())
+            {
+                EditorGUILayout.BeginVertical(GUI.skin.box);
+
+                bool lastShowFilters = m_ShowFilters;
+                m_ShowFilters = BoldFoldout(m_ShowFilters, Styles.filters);
+                var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                if (m_ShowFilters)
+                {
+                    DrawRemoveMarker();
+
+                    DrawNameFilter();
+                    EditorGUILayout.BeginHorizontal();
+                    DrawThreadFilter(m_ProfileSingleView.data);
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_DepthSliceUI.DrawDepthFilter(IsAnalysisRunning(), m_ActiveTab == ActiveTab.Summary,
+                        m_ProfileSingleView, m_ProfileLeftView, m_ProfileRightView);
+                    DrawTimingFilter();
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    DrawParentFilter();
+                    DrawUnitFilter();
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    bool lastEnabled = GUI.enabled;
+                    GUI.enabled = !IsAnalysisRunning();
+                    if (GUILayout.Button(new GUIContent("Analyze", m_LastAnalysisTime), GUILayout.Width(100)))
+                        m_RequestAnalysis = true;
+                    GUI.enabled = lastEnabled;
+                    DrawMarkerCount();
+                    EditorGUILayout.LabelField(",", GUILayout.Width(10), GUILayout.ExpandWidth(false));
+                    DrawThreadCount();
+                    GUILayout.FlexibleSpace();
+                    DrawMarkerColumnFilter();
+                    EditorGUILayout.EndHorizontal();
+                }
+
+                if (m_ShowFilters != lastShowFilters)
+                {
+                    ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Filters,
+                        analytic.GetDurationInSeconds(), m_ShowFilters);
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+        }
+
+        internal bool IsAnalysisRunning()
+        {
+            return m_ThreadActivity != ThreadActivity.None;
+        }
+
+        internal bool IsLoading()
+        {
+            return m_ThreadActivity == ThreadActivity.Load;
+        }
+
+        float GetProgress()
+        {
+            // We return the value from the update loop so the data doesn't change over the time onGui is called for layout and repaint
+            // m_ThreadProgress ranges from 0 to 100.
+            return m_ThreadProgress * 0.01f;
+        }
+
+        bool IsAnalysisValid(ProfileDataView view, bool checkFrameCount = false)
+        {
+            if (!view.IsDataValid())
+                return false;
+
+            if (view.analysis == null)
+                return false;
+
+            if (checkFrameCount)
+            {
+                if (view.analysis.GetFrameSummary().frames.Count <= 0)
+                    return false;
+            }
+
+            return true;
+        }
+
+        bool IsAnalysisValid(bool checkFrameCount = false)
+        {
+            switch (m_ActiveTab)
+            {
+                case ActiveTab.Summary:
+                    if (!IsAnalysisValid(m_ProfileSingleView, checkFrameCount))
+                        return false;
+                    break;
+
+                case ActiveTab.Compare:
+                    if (!IsAnalysisValid(m_ProfileLeftView, checkFrameCount))
+                        return false;
+                    if (!IsAnalysisValid(m_ProfileRightView, checkFrameCount))
+                        return false;
+                    break;
+            }
+
+            //if (IsAnalysisRunning())
+            //    return false;
+
+            return true;
+        }
+
+        void DrawProgress(Rect rect)
+        {
+            if (IsAnalysisRunning())
+            {
+                EditorGUILayout.BeginHorizontal(GUILayout.MaxWidth(140));
+                float x = 0;
+                float y = 0;
+                float width = rect.width;
+                float height = k_ProgressBarHeight;
+                if (m_2D.DrawStart(width, height, Draw2D.Origin.TopLeft))
+                {
+                    float barLength = width * GetProgress();
+                    m_2D.DrawFilledBox(x, y, barLength, height, UIColor.white);
+                    m_2D.DrawEnd();
+                }
+                EditorGUILayout.EndHorizontal();
+            }
+            else
+            {
+                EditorGUILayout.BeginVertical();
+                GUILayout.Space(k_ProgressBarHeight);
+                EditorGUILayout.EndVertical();
+            }
+        }
+
+        void DrawPullButton(Color color, ProfileDataView view, FrameTimeGraph frameTimeGraph)
+        {
+            bool lastEnabled = GUI.enabled;
+            GUI.enabled = !IsAnalysisRunning();
+
+            GUIContent content;
+            if (!IsProfilerWindowOpen())
+            {
+                content = Styles.pullOpen;
+                GUI.enabled = false;
+            }
+            else if (m_ProfilerFirstFrameIndex == 0 && m_ProfilerLastFrameIndex == 0)
+            {
+                content = Styles.pullRange;
+                GUI.enabled = false;
+            }
+            /*
+            // Commented out so we can capture even if recording
+            else if (m_ProfilerWindowInterface.IsRecording())
+            {
+                content = Styles.pullRecording;
+                GUI.enabled = false;
+            }
+            */
+            else
+            {
+                content = Styles.pull;
+            }
+
+            Color oldColor = GUI.backgroundColor;
+            GUI.backgroundColor = color;
+            bool pull = GUILayout.Button(content, GUILayout.Width(100));
+            GUI.backgroundColor = oldColor;
+            if (pull)
+            {
+                PullFromProfiler(m_ProfilerFirstFrameIndex, m_ProfilerLastFrameIndex, view, frameTimeGraph);
+                UpdateActiveTab(true, false);
+            }
+            GUI.enabled = lastEnabled;
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawFilesLoadedProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawFilesLoaded");
+
+        void DrawFilesLoaded()
+        {
+            using (m_DrawFilesLoadedProfilerMarker.Auto())
+            {
+                var boxStyle = GUI.skin.box;
+                var rect = EditorGUILayout.BeginVertical(boxStyle);
+
+                if (m_ActiveTab == ActiveTab.Summary)
+                {
+                    EditorGUILayout.BeginHorizontal(GUILayout.Height(100 + GUI.skin.label.lineHeight +
+                        (2 * (GUI.skin.label.margin.vertical +
+                            GUI.skin.label.padding.vertical))));
+
+                    float filenameWidth = GetFilenameWidth(m_ProfileSingleView.path);
+                    filenameWidth = Math.Min(filenameWidth, 200);
+                    EditorGUILayout.BeginVertical(GUILayout.MaxWidth(100 + filenameWidth),
+                        GUILayout.ExpandWidth(false));
+                    DrawPullButton(GUI.backgroundColor, m_ProfileSingleView, m_FrameTimeGraph);
+                    DrawLoadSave();
+                    EditorGUILayout.EndVertical();
+
+                    EditorGUILayout.BeginVertical(GUILayout.ExpandWidth(true));
+                    DrawFrameTimeGraph(100);
+                    EditorGUILayout.EndVertical();
+
+                    EditorGUILayout.EndHorizontal();
+                }
+
+                if (m_ActiveTab == ActiveTab.Compare)
+                {
+                    DrawComparisonLoadSave();
+                }
+
+                rect.width -= boxStyle.margin.right;
+                DrawProgress(rect);
+
+                EditorGUILayout.EndVertical();
+            }
+        }
+
+        void ShowHelp()
+        {
+            EditorGUILayout.BeginVertical(GUI.skin.box);
+
+            m_HelpScroll = EditorGUILayout.BeginScrollView(m_HelpScroll, GUILayout.ExpandHeight(true));
+            GUILayout.TextArea(Styles.helpText);
+            EditorGUILayout.EndScrollView();
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawAnalysisProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawAnalysis");
+        static readonly ProfilerMarkerAbstracted m_TopNMarkersProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.TopNMarkers");
+        static readonly ProfilerMarkerAbstracted m_DrawMarkerTableProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawMarkerTable");
+        void DrawAnalysis()
+        {
+            using (m_DrawAnalysisProfilerMarker.Auto())
+            {
+                EditorGUILayout.BeginHorizontal();
+
+                EditorGUILayout.BeginVertical();
+
+                DrawFilesLoaded();
+
+                if (m_ProfileSingleView.IsDataValid() && m_ProfileSingleView.data.GetFrameCount() > 0)
+                {
+                    DrawAnalysisOptions();
+
+                    if (IsAnalysisValid())
+                    {
+                        EditorGUILayout.BeginVertical(GUI.skin.box);
+
+                        string title = string.Format("Top {0} markers on median frame", m_TopNBars);
+                        GUIContent markersTitle = new GUIContent(title, Styles.topMarkersTooltip);
+                        bool lastShowTopMarkers = m_ShowTopNMarkers;
+                        m_ShowTopNMarkers = BoldFoldout(m_ShowTopNMarkers, markersTitle);
+                        var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                        if (m_ShowTopNMarkers)
+                        {
+                            using (m_TopNMarkersProfilerMarker.Auto())
+                            {
+                                m_TopMarkers.SetData(m_ProfileSingleView, m_DepthSliceUI.depthFilter, GetNameFilters(),
+                                    GetNameExcludes(), m_TimingOption, m_ThreadSelection.selection.Count, m_hideRemovedMarkers);
+
+                                EditorGUILayout.BeginVertical(GUILayout.Height(20));
+
+                                EditorGUILayout.BeginHorizontal();
+                                FrameSummary frameSummary = m_ProfileSingleView.analysis.GetFrameSummary();
+                                if (frameSummary.count > 0)
+                                    DrawFrameIndexButton(frameSummary.medianFrameIndex, m_ProfileSingleView);
+                                else
+                                    GUILayout.Label("", GUILayout.MinWidth(50));
+
+                                Rect rect = EditorGUILayout.GetControlRect(GUILayout.ExpandWidth(true),
+                                    GUILayout.ExpandHeight(true));
+                                float range = m_TopMarkers.GetTopMarkerTimeRange();
+                                m_TopMarkers.Draw(rect, UIColor.bar, m_TopNBars, range, UIColor.barBackground,
+                                    Color.black, Color.white, true, true);
+                                EditorGUILayout.EndHorizontal();
+                                EditorGUILayout.EndVertical();
+
+                                EditorGUILayout.BeginVertical(GUILayout.Height(20));
+                                GUILayout.Label(m_DepthSliceUI.GetUIInfo(false));
+                                EditorGUILayout.EndVertical();
+                            }
+                        }
+
+                        if (m_ShowTopNMarkers != lastShowTopMarkers)
+                        {
+                            ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.TopTen,
+                                analytic.GetDurationInSeconds(), m_ShowTopNMarkers);
+                        }
+
+                        EditorGUILayout.EndVertical();
+
+                        if (m_ProfileTable != null)
+                        {
+                            m_ShowMarkerTable = BoldFoldout(m_ShowMarkerTable, Styles.profileTable);
+                            if (m_ShowMarkerTable)
+                            {
+                                using (m_DrawMarkerTableProfilerMarker.Auto())
+                                {
+                                    Rect r = EditorGUILayout.GetControlRect(GUILayout.ExpandHeight(true));
+
+                                    float scrollBarWidth = GUI.skin.verticalScrollbar.fixedWidth +
+                                        GUI.skin.verticalScrollbar.border.horizontal +
+                                        GUI.skin.verticalScrollbar.margin.horizontal +
+                                        GUI.skin.verticalScrollbar.padding.horizontal;
+                                    scrollBarWidth += LayoutSize.ScrollBarPadding;
+
+                                    //offset vertically to get correct clipping behaviour
+                                    Rect clipRect = new Rect(r.x, m_ProfileTable.state.scrollPos.y,
+                                        r.width - scrollBarWidth,
+                                        r.height -
+                                        (m_ProfileTable.multiColumnHeader.height + GUI.skin.box.padding.top) -
+                                        (m_ProfileTable.ShowingHorizontalScroll
+                                            ? (scrollBarWidth - LayoutSize.ScrollBarPadding)
+                                            : 0));
+                                    m_2D.SetClipRect(clipRect);
+                                    m_ProfileTable.OnGUI(r);
+                                    m_2D.ClearClipRect();
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    ShowHelp();
+                }
+
+                EditorGUILayout.EndVertical();
+
+                EditorGUILayout.BeginVertical(GUILayout.Width(LayoutSize.WidthRHS));
+                GUILayout.Space(4);
+                DrawFrameSummary();
+                DrawThreadSummary();
+                DrawSelected();
+                EditorGUILayout.EndVertical();
+
+                EditorGUILayout.EndHorizontal();
+            }
+        }
+
+        void SetRange(List<int> selectedOffsets, int clickCount, FrameTimeGraph.State inputStatus, ProfileDataView mainData, List<int> selectedIndices)
+        {
+            if (inputStatus == FrameTimeGraph.State.Dragging)
+                return;
+
+            var data = mainData.data;
+            if (clickCount == 2)
+            {
+                if (mainData.inSyncWithProfilerData)
+                {
+                    int index = data.OffsetToDisplayFrame(selectedOffsets[0]);
+                    JumpToFrame(index, mainData.data, false);
+                }
+            }
+            else
+            {
+                selectedIndices.Clear();
+                foreach (int offset in selectedOffsets)
+                {
+                    selectedIndices.Add(data.OffsetToDisplayFrame(offset));
+                }
+                // Keep indices sorted
+                selectedIndices.Sort();
+
+                m_RequestCompare = true;
+            }
+        }
+
+        void SetLeftRange(List<int> selectedOffsets, int clickCount, FrameTimeGraph.State inputStatus)
+        {
+            SetRange(selectedOffsets, clickCount, inputStatus, m_ProfileLeftView, m_ProfileLeftView.selectedIndices);
+        }
+
+        void SetRightRange(List<int> selectedOffsets, int clickCount, FrameTimeGraph.State inputStatus)
+        {
+            SetRange(selectedOffsets, clickCount, inputStatus, m_ProfileRightView, m_ProfileRightView.selectedIndices);
+        }
+
+        void DrawComparisonLoadSaveButton(Color color, ProfileDataView view, FrameTimeGraph frameTimeGraph, ActiveView activeView)
+        {
+            bool lastEnabled = GUI.enabled;
+            bool isAnalysisRunning = IsAnalysisRunning();
+
+            EditorGUILayout.BeginHorizontal(GUILayout.MaxWidth(300), GUILayout.ExpandWidth(false));
+
+            GUIStyle buttonStyle = GUI.skin.button;
+            Color oldColor = GUI.backgroundColor;
+
+            GUI.backgroundColor = color;
+            GUI.enabled = !isAnalysisRunning;
+            bool load = GUILayout.Button("Load", buttonStyle, GUILayout.ExpandWidth(false), GUILayout.Width(50));
+            GUI.enabled = lastEnabled;
+            GUI.backgroundColor = oldColor;
+            if (load)
+            {
+                m_Path = EditorUtility.OpenFilePanel("Load profile analyzer data file", "", "pdata");
+                if (m_Path.Length != 0)
+                {
+                    m_ActiveLoadingView = activeView;
+                    BeginAsyncAction(ThreadActivity.Load);
+                }
+                GUIUtility.ExitGUI();
+            }
+
+            GUI.backgroundColor = color;
+            GUI.enabled = !isAnalysisRunning && view.IsDataValid();
+            bool save = GUILayout.Button("Save", buttonStyle, GUILayout.ExpandWidth(false), GUILayout.Width(50));
+            GUI.enabled = lastEnabled;
+            GUI.backgroundColor = oldColor;
+            if (save)
+            {
+                Save(view, true);
+            }
+
+            ShowFilename(view.path);
+
+            EditorGUILayout.EndHorizontal();
+        }
+
+        float GetComparisonYRange()
+        {
+            float yRangeLeft = m_ProfileLeftView.IsDataValid() ? m_LeftFrameTimeGraph.GetDataRange() : 0f;
+            float yRangeRight = m_ProfileRightView.IsDataValid() ? m_RightFrameTimeGraph.GetDataRange() : 0f;
+            float yRange = Math.Max(yRangeLeft, yRangeRight);
+
+            return yRange;
+        }
+
+        void SetFrameTimeGraphPairing(bool paired)
+        {
+            if (paired != m_FrameTimeGraphsPaired)
+            {
+                m_FrameTimeGraphsPaired = paired;
+                m_LeftFrameTimeGraph.PairWith(m_FrameTimeGraphsPaired ? m_RightFrameTimeGraph : null);
+            }
+        }
+
+        void DrawComparisonLoadSave()
+        {
+            int leftFrames = m_ProfileLeftView.IsDataValid() ? m_ProfileLeftView.data.GetFrameCount() : 0;
+            int rightFrames = m_ProfileRightView.IsDataValid() ? m_ProfileRightView.data.GetFrameCount() : 0;
+            int maxFrames = Math.Max(leftFrames, rightFrames);
+
+            float yRange = GetComparisonYRange();
+
+            EditorGUILayout.BeginHorizontal(GUILayout.Height(100 + GUI.skin.label.lineHeight + (2 * (GUI.skin.label.margin.vertical + GUI.skin.label.padding.vertical))));
+
+            float leftFilenameWidth = GetFilenameWidth(m_ProfileLeftView.path);
+            float rightFilenameWidth = GetFilenameWidth(m_ProfileRightView.path);
+            float filenameWidth = Math.Max(leftFilenameWidth, rightFilenameWidth);
+            filenameWidth = Math.Min(filenameWidth, 200);
+
+            EditorGUILayout.BeginVertical(GUILayout.MaxWidth(100 + filenameWidth), GUILayout.ExpandWidth(false));
+            DrawPullButton(UIColor.left, m_ProfileLeftView, m_LeftFrameTimeGraph);
+            DrawComparisonLoadSaveButton(UIColor.left, m_ProfileLeftView, m_LeftFrameTimeGraph, ActiveView.Left);
+            DrawPullButton(UIColor.right, m_ProfileRightView, m_RightFrameTimeGraph);
+            DrawComparisonLoadSaveButton(UIColor.right, m_ProfileRightView, m_RightFrameTimeGraph, ActiveView.Right);
+            EditorGUILayout.EndVertical();
+
+
+            bool lastEnabled = GUI.enabled;
+            bool enabled = !IsAnalysisRunning();
+
+            EditorGUILayout.BeginVertical(GUILayout.ExpandWidth(true));
+
+            bool valid = IsSelectedMarkerValid();
+            string validMarkerName = valid ? m_SelectedMarker.name : "";
+
+            GUI.SetNextControlName("LeftFrameTimeGraph");
+            Rect rect = EditorGUILayout.GetControlRect(GUILayout.Height(50));
+            if (m_ProfileLeftView.IsDataValid())
+            {
+                if (!m_LeftFrameTimeGraph.HasData())
+                    m_LeftFrameTimeGraph.SetData(GetFrameTimeData(m_ProfileLeftView.data));
+                if (!m_ProfileLeftView.HasValidSelection())
+                    m_ProfileLeftView.SelectFullRange();
+
+                List<int> selectedOffsets = new List<int>();
+                foreach (int index in m_ProfileLeftView.selectedIndices)
+                {
+                    selectedOffsets.Add(m_ProfileLeftView.data.DisplayFrameToOffset(index));
+                }
+
+                int offsetToDisplayMapping = GetRemappedUIFirstFrameDisplayOffset(m_ProfileLeftView);
+                int offsetToIndexMapping = GetRemappedUIFirstFrameOffset(m_ProfileLeftView);
+
+                m_LeftFrameTimeGraph.SetEnabled(enabled);
+                m_LeftFrameTimeGraph.Draw(rect, m_ProfileLeftView.analysis, selectedOffsets, yRange, offsetToDisplayMapping, offsetToIndexMapping, validMarkerName, maxFrames, m_ProfileLeftView.analysisFull);
+            }
+            else
+            {
+                GUI.Label(rect, Styles.comparisonDataMissing, m_StyleUpperLeft);
+            }
+
+            GUI.SetNextControlName("RightFrameTimeGraph");
+            rect = EditorGUILayout.GetControlRect(GUILayout.Height(50));
+            if (m_ProfileRightView.IsDataValid())
+            {
+                if (!m_RightFrameTimeGraph.HasData())
+                    m_RightFrameTimeGraph.SetData(GetFrameTimeData(m_ProfileRightView.data));
+                if (!m_ProfileRightView.HasValidSelection())
+                    m_ProfileRightView.SelectFullRange();
+
+                List<int> selectedOffsets = new List<int>();
+                foreach (int index in m_ProfileRightView.selectedIndices)
+                {
+                    selectedOffsets.Add(m_ProfileRightView.data.DisplayFrameToOffset(index));
+                }
+
+                int offsetToDisplayMapping = GetRemappedUIFirstFrameDisplayOffset(m_ProfileRightView);
+                int offsetToIndexMapping = GetRemappedUIFirstFrameOffset(m_ProfileRightView);
+
+                m_RightFrameTimeGraph.SetEnabled(enabled);
+                m_RightFrameTimeGraph.Draw(rect, m_ProfileRightView.analysis, selectedOffsets, yRange, offsetToDisplayMapping, offsetToIndexMapping, validMarkerName, maxFrames, m_ProfileRightView.analysisFull);
+            }
+            else
+            {
+                GUI.Label(rect, Styles.comparisonDataMissing, m_StyleUpperLeft);
+            }
+
+            EditorGUILayout.BeginHorizontal();
+            if (m_ProfileLeftView.IsDataValid() && m_ProfileRightView.IsDataValid() && m_ProfileLeftView.data.GetFrameCount() > 0 && m_ProfileRightView.data.GetFrameCount() > 0)
+            {
+                GUIStyle lockButtonStyle = "IN LockButton";
+                GUIStyle style = new GUIStyle(lockButtonStyle);
+                style.padding.left = 20;
+                //bool paired = GUILayout.Toggle(m_frameTimeGraphsPaired, Styles.graphPairing, style);
+                GUI.enabled = enabled;
+                bool paired = EditorGUILayout.ToggleLeft(Styles.graphPairing, m_FrameTimeGraphsPaired, style, GUILayout.MaxWidth(200));
+                GUI.enabled = lastEnabled;
+                SetFrameTimeGraphPairing(paired);
+
+                GUILayout.FlexibleSpace();
+                ShowSelectedMarker();
+            }
+            EditorGUILayout.EndHorizontal();
+
+            EditorGUILayout.EndVertical();
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void DrawComparisonHistogram(float height, float minValue, float maxValue, int bucketCount, int[] leftBuckets, int[] rightBuckets, int leftCount, int rightCount, bool leftValid, bool rightValid, DisplayUnits displayUnits)
+        {
+            Histogram histogram = new Histogram(m_2D, displayUnits.Units);
+            float width = LayoutSize.HistogramWidth;
+            float min = minValue;
+            float max = maxValue;
+            float spacing = 2;
+
+            float range = max - min;
+            // bucketCount = (range == 0f) ? 1 : bucketCount;
+
+            float x = (spacing / 2);
+            float y = 0;
+            float w = ((width + spacing) / bucketCount) - spacing;
+            float h = height;
+
+            histogram.DrawStart(width);
+
+            if (m_2D.DrawStart(width, height, Draw2D.Origin.BottomLeft))
+            {
+                float bucketWidth = (range / bucketCount);
+                Rect rect = GUILayoutUtility.GetLastRect();
+
+                histogram.DrawBackground(width, height, bucketCount, min, max, spacing);
+
+                if (!IsAnalysisRunning())
+                {
+                    for (int bucketAt = 0; bucketAt < bucketCount; bucketAt++)
+                    {
+                        float leftBarCount = leftValid ? leftBuckets[bucketAt] : 0;
+                        float rightBarCount = rightValid ? rightBuckets[bucketAt] : 0;
+                        float leftBarHeight = leftValid ? ((h * leftBarCount) / leftCount) : 0;
+                        float rightBarHeight = rightValid ? ((h * rightBarCount) / rightCount) : 0;
+
+                        if (leftBarCount > 0)  // Make sure we always slow a small bar if non zero
+                            leftBarHeight = Mathf.Max(1.0f, leftBarHeight);
+                        if (rightBarCount > 0)  // Make sure we always slow a small bar if non zero
+                            rightBarHeight = Mathf.Max(1.0f, rightBarHeight);
+
+                        if ((int)rightBarHeight == (int)leftBarHeight)
+                        {
+                            m_2D.DrawFilledBox(x, y, w, leftBarHeight, UIColor.both);
+                        }
+                        else if (rightBarHeight > leftBarHeight)
+                        {
+                            m_2D.DrawFilledBox(x, y, w, rightBarHeight, UIColor.right);
+                            m_2D.DrawFilledBox(x, y, w, leftBarHeight, UIColor.both);
+                        }
+                        else
+                        {
+                            m_2D.DrawFilledBox(x, y, w, leftBarHeight, UIColor.left);
+                            m_2D.DrawFilledBox(x, y, w, rightBarHeight, UIColor.both);
+                        }
+
+                        float bucketStart = min + (bucketAt * bucketWidth);
+                        float bucketEnd = bucketStart + bucketWidth;
+
+                        string tooltip = string.Format(
+                            "{0}-{1}\nLeft: {2} {3}\nRight: {4} {5}\n\nBar width: {6}",
+                            displayUnits.ToTooltipString(bucketStart, false),
+                            displayUnits.ToTooltipString(bucketEnd, true),
+                            leftBarCount, leftBarCount == 1 ? "frame" : "frames",
+                            rightBarCount, rightBarCount == 1 ? "frame" : "frames",
+                            displayUnits.ToTooltipString(bucketWidth, true));
+                        GUI.Label(new Rect(rect.x + x, rect.y + y, w, h),
+                            new GUIContent("", tooltip)
+                        );
+
+                        x += w;
+                        x += spacing;
+                    }
+                }
+
+                m_2D.DrawEnd();
+            }
+
+            histogram.DrawEnd(width, min, max, spacing);
+        }
+
+        void DrawComparisonFrameSummary()
+        {
+            EditorGUILayout.BeginVertical(GUI.skin.box, GUILayout.Width(LayoutSize.WidthRHS));
+
+            bool lastShowFrameSummary = m_ShowFrameSummary;
+            m_ShowFrameSummary = BoldFoldout(m_ShowFrameSummary, Styles.frameSummary);
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            if (m_ShowFrameSummary)
+            {
+                EditorGUILayout.BeginVertical(); // To match indenting on the marker summary where a scroll area is present
+
+                if (IsAnalysisValid())
+                {
+                    var leftFrameSummary = m_ProfileLeftView.analysis.GetFrameSummary();
+                    var rightFrameSummary = m_ProfileRightView.analysis.GetFrameSummary();
+
+                    m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+                    m_Columns.Draw4("", "Left", "Right", "Diff");
+
+                    int diff = rightFrameSummary.count - leftFrameSummary.count;
+                    m_Columns.Draw4(Styles.frameCount, GetFrameCountText(m_ProfileLeftView), GetFrameCountText(m_ProfileRightView), new GUIContent(diff.ToString(), ""));
+                    m_Columns.Draw3(Styles.frameStart, GetFirstFrameText(m_ProfileLeftView), GetFirstFrameText(m_ProfileRightView));
+                    m_Columns.Draw3(Styles.frameEnd, GetLastFrameText(m_ProfileLeftView), GetLastFrameText(m_ProfileRightView));
+
+                    m_Columns.Draw(0, "");
+                    string units = GetDisplayUnits();
+                    m_Columns.Draw4("", units, units, units);
+
+                    Draw4DiffMs(Styles.max, leftFrameSummary.msMax, leftFrameSummary.maxFrameIndex, rightFrameSummary.msMax, rightFrameSummary.maxFrameIndex);
+                    Draw4DiffMs(Styles.upperQuartile, leftFrameSummary.msUpperQuartile, rightFrameSummary.msUpperQuartile);
+                    Draw4DiffMs(Styles.median, leftFrameSummary.msMedian, leftFrameSummary.medianFrameIndex, rightFrameSummary.msMedian, rightFrameSummary.medianFrameIndex);
+                    Draw4DiffMs(Styles.mean, leftFrameSummary.msMean, rightFrameSummary.msMean);
+                    Draw4DiffMs(Styles.lowerQuartile, leftFrameSummary.msLowerQuartile, rightFrameSummary.msLowerQuartile);
+                    Draw4DiffMs(Styles.min, leftFrameSummary.msMin, leftFrameSummary.minFrameIndex, rightFrameSummary.msMin, rightFrameSummary.minFrameIndex);
+
+                    GUIStyle style = GUI.skin.label;
+                    GUILayout.Space(style.lineHeight);
+
+                    EditorGUILayout.BeginHorizontal();
+                    int leftBucketCount = leftFrameSummary.buckets.Length;
+                    int rightBucketCount = rightFrameSummary.buckets.Length;
+
+                    float msFrameMax = Math.Max(leftFrameSummary.msMax, rightFrameSummary.msMax);
+                    float yRange = msFrameMax;
+
+                    if (leftBucketCount != rightBucketCount)
+                    {
+                        Debug.Log("Error left frame summary bucket count doesn't equal right summary");
+                    }
+                    else
+                    {
+                        DrawComparisonHistogram(40, 0, yRange, leftBucketCount, leftFrameSummary.buckets, rightFrameSummary.buckets, leftFrameSummary.count, rightFrameSummary.count, true, true, m_DisplayUnits);
+                    }
+
+                    BoxAndWhiskerPlot boxAndWhiskerPlot = new BoxAndWhiskerPlot(m_2D, m_DisplayUnits.Units);
+
+                    float plotWidth = 40 + GUI.skin.box.padding.horizontal;
+                    float plotHeight = 40;
+                    plotWidth /= 2.0f;
+                    boxAndWhiskerPlot.Draw(plotWidth, plotHeight, leftFrameSummary.msMin, leftFrameSummary.msLowerQuartile,
+                        leftFrameSummary.msMedian, leftFrameSummary.msUpperQuartile, leftFrameSummary.msMax, 0, yRange,
+                        UIColor.boxAndWhiskerLineColorLeft, UIColor.boxAndWhiskerBoxColorLeft);
+                    boxAndWhiskerPlot.Draw(plotWidth, plotHeight, rightFrameSummary.msMin, rightFrameSummary.msLowerQuartile,
+                        rightFrameSummary.msMedian, rightFrameSummary.msUpperQuartile, rightFrameSummary.msMax, 0, yRange,
+                        UIColor.boxAndWhiskerLineColorRight, UIColor.boxAndWhiskerBoxColorRight);
+
+                    boxAndWhiskerPlot.DrawText(m_Columns.GetColumnWidth(3), plotHeight, 0, yRange,
+                        "Min frame time for selected frames in the 2 data sets",
+                        "Max frame time for selected frames in the 2 data sets");
+
+                    EditorGUILayout.EndHorizontal();
+                }
+                else
+                {
+                    EditorGUILayout.LabelField("No analysis data selected");
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+
+            if (m_ShowFrameSummary != lastShowFrameSummary)
+            {
+                ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Frames, analytic.GetDurationInSeconds(), m_ShowFrameSummary);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void ShowThreadRange()
+        {
+            EditorGUILayout.BeginHorizontal();
+            m_Columns.Draw(0, Styles.threadGraphScale);
+            m_ThreadRange = (ThreadRange)EditorGUILayout.Popup((int)m_ThreadRange, Styles.threadRanges, GUILayout.Width(160));
+            EditorGUILayout.EndHorizontal();
+        }
+
+        float GetThreadTimeRange(ProfileAnalysis profileAnalysis)
+        {
+            if (profileAnalysis == null)
+                return 0.0f;
+
+            var frameSummary = profileAnalysis.GetFrameSummary();
+            float range = frameSummary.msMax;
+            switch (m_ThreadRange)
+            {
+                case ThreadRange.Median:
+                    range = frameSummary.msMedian;
+                    break;
+                case ThreadRange.UpperQuartile:
+                    range = frameSummary.msUpperQuartile;
+                    break;
+                case ThreadRange.Max:
+                    range = frameSummary.msMax;
+                    break;
+            }
+
+            return range;
+        }
+
+        int GetThreadSelectionCount(out int leftSelectionCount, out int rightSelectionCount)
+        {
+            List<string> threadSelection = GetLimitedThreadSelection(m_ThreadNames, m_ThreadSelection);
+            leftSelectionCount = 0;
+            foreach (var threadName in m_ProfileLeftView.data.GetThreadNames())
+            {
+                if (threadSelection.Contains(threadName))
+                {
+                    leftSelectionCount++;
+                }
+            }
+            rightSelectionCount = 0;
+            foreach (var threadName in m_ProfileRightView.data.GetThreadNames())
+            {
+                if (threadSelection.Contains(threadName))
+                {
+                    rightSelectionCount++;
+                }
+            }
+            return threadSelection.Count;
+        }
+
+        void DrawComparisonThreadSummary()
+        {
+            EditorGUILayout.BeginVertical(GUI.skin.box, GUILayout.Width(LayoutSize.WidthRHS));
+
+            bool lastShowThreadSummary = m_ShowThreadSummary;
+            m_ShowThreadSummary = BoldFoldout(m_ShowThreadSummary, Styles.threadSummary);
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            if (m_ShowThreadSummary)
+            {
+                EditorGUILayout.BeginVertical(); // To match indenting on the marker summary where a scroll area is present
+
+                if (IsAnalysisValid())
+                {
+                    m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw4("", "Left", "Right", "Total");
+                    EditorGUILayout.EndHorizontal();
+
+                    int matchingCount, uniqueLeft, uniqueRight;
+                    int allThreadsCount = GetCombinedThreadCount(out matchingCount, out uniqueLeft, out uniqueRight);
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw(0, "Total Count : ");
+                    m_Columns.Draw(1, new GUIContent(m_ProfileLeftView.data.GetThreadCount().ToString(), "Total threads in left data set"));
+                    m_Columns.Draw(2, new GUIContent(m_ProfileRightView.data.GetThreadCount().ToString(), "Total threads in right data set"));
+                    string tooltip = GetThreadCountToolTipUnion(allThreadsCount, matchingCount);
+                    m_Columns.Draw(3, new GUIContent(allThreadsCount.ToString(), tooltip));
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw(0, "Unique Count : ");
+                    m_Columns.Draw(1, new GUIContent(uniqueLeft.ToString(), "Unique to left data set"));
+                    m_Columns.Draw(2, new GUIContent(uniqueRight.ToString(), "Unique to right data set"));
+                    tooltip = GetThreadCountToolTipDifference(allThreadsCount, matchingCount, uniqueLeft, uniqueRight);
+                    m_Columns.Draw(3, new GUIContent((allThreadsCount - matchingCount).ToString(), tooltip));
+                    EditorGUILayout.EndHorizontal();
+
+                    int leftSelectionCount, rightSelectionCount;
+                    int selectedThreads = GetThreadSelectionCount(out leftSelectionCount, out rightSelectionCount);
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw(0, "Selected : ");
+                    m_Columns.Draw(1, new GUIContent(leftSelectionCount.ToString(), "Left selected"));
+                    m_Columns.Draw(2, new GUIContent(rightSelectionCount.ToString(), "Right selected"));
+                    m_Columns.Draw(3, new GUIContent(selectedThreads.ToString(), "Total selected"));
+                    EditorGUILayout.EndHorizontal();
+
+                    m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2 + LayoutSize.WidthColumn3, 0);
+                    ShowThreadRange();
+
+                    float width = 100;
+                    float height = GUI.skin.label.lineHeight;
+
+                    float xAxisMin = 0.0f;
+                    float xAxisMax = GetThreadTimeRange(m_ProfileLeftView.analysis);
+
+                    m_Columns.Draw3(Styles.emptyString, Styles.median, Styles.thread);
+
+                    m_ThreadScroll = EditorGUILayout.BeginScrollView(m_ThreadScroll, GUIStyle.none, GUI.skin.verticalScrollbar);
+                    Rect clipRect = new Rect(m_ThreadScroll.x, m_ThreadScroll.y, m_ComparisonThreadsAreaRect.width, m_ComparisonThreadsAreaRect.height);
+                    m_2D.SetClipRect(clipRect);
+                    for (int i = 0; i < m_ThreadUINames.Count; i++)
+                    {
+                        string threadNameWithIndex = m_ThreadNames[i];
+
+                        bool include = ProfileAnalyzer.MatchThreadFilter(threadNameWithIndex, m_ThreadSelection.selection);
+                        if (!include)
+                            continue;
+
+                        ThreadData threadLeft = m_ProfileLeftView.analysis.GetThreadByName(threadNameWithIndex);
+                        ThreadData threadRight = m_ProfileRightView.analysis.GetThreadByName(threadNameWithIndex);
+
+                        ThreadData thread = threadLeft != null ? threadLeft : threadRight;
+                        if (thread == null)
+                            continue;
+
+                        bool singleThread = thread.threadsInGroup > 1 ? false : true;
+
+                        BoxAndWhiskerPlot boxAndWhiskerPlot = new BoxAndWhiskerPlot(m_2D, m_DisplayUnits.Units);
+                        EditorGUILayout.BeginHorizontal();
+                        if (threadLeft != null)
+                            boxAndWhiskerPlot.DrawHorizontal(width, height, threadLeft.msMin, threadLeft.msLowerQuartile, threadLeft.msMedian, threadLeft.msUpperQuartile, threadLeft.msMax, xAxisMin, xAxisMax, UIColor.boxAndWhiskerLineColorLeft, UIColor.boxAndWhiskerBoxColorLeft, GUI.skin.label);
+                        else
+                            EditorGUILayout.LabelField(Styles.noThread, GUILayout.Width(width));
+                        m_Columns.Draw(1, (threadLeft != null) ? ToDisplayUnitsWithTooltips(threadLeft.msMedian) : Styles.noThread);
+                        m_Columns.Draw(2, GetThreadNameWithGroupTooltip(thread.threadNameWithIndex, singleThread));
+                        EditorGUILayout.EndHorizontal();
+
+                        EditorGUILayout.BeginHorizontal();
+                        if (threadRight != null)
+                            boxAndWhiskerPlot.DrawHorizontal(width, height, threadRight.msMin, threadRight.msLowerQuartile, threadRight.msMedian, threadRight.msUpperQuartile, threadRight.msMax, xAxisMin, xAxisMax, UIColor.boxAndWhiskerLineColorRight, UIColor.boxAndWhiskerBoxColorRight, GUI.skin.label);
+                        else
+                            EditorGUILayout.LabelField(Styles.noThread, GUILayout.Width(width));
+                        m_Columns.Draw(1, (threadRight != null) ? ToDisplayUnitsWithTooltips(threadRight.msMedian) : Styles.noThread);
+                        m_Columns.Draw(2, "");
+                        EditorGUILayout.EndHorizontal();
+                    }
+                    m_2D.ClearClipRect();
+                    EditorGUILayout.EndScrollView();
+
+                    if (Event.current.type == EventType.Repaint)
+                    {
+                        // This value is not valid at layout phase
+                        m_ComparisonThreadsAreaRect = GUILayoutUtility.GetLastRect();
+                    }
+                }
+                else
+                {
+                    EditorGUILayout.LabelField("No analysis data selected");
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+
+            if (m_ShowThreadSummary != lastShowThreadSummary)
+            {
+                ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Threads, analytic.GetDurationInSeconds(), m_ShowThreadSummary);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawCompareOptionsProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawCompareOptions");
+
+        void DrawCompareOptions()
+        {
+            using (m_DrawCompareOptionsProfilerMarker.Auto())
+            {
+                EditorGUILayout.BeginVertical(GUI.skin.box);
+
+                bool lastShowFilters = m_ShowFilters;
+                m_ShowFilters = BoldFoldout(m_ShowFilters, Styles.filters);
+                var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                if (m_ShowFilters)
+                {
+                    DrawRemoveMarker();
+
+                    DrawNameFilter();
+                    EditorGUILayout.BeginHorizontal();
+                    DrawThreadFilter(m_ProfileLeftView.data);
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_DepthSliceUI.DrawDepthFilter(IsAnalysisRunning(), m_ActiveTab == ActiveTab.Summary,
+                        m_ProfileSingleView, m_ProfileLeftView, m_ProfileRightView);
+                    DrawTimingFilter();
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    DrawParentFilter();
+                    DrawUnitFilter();
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    if (m_ProfileLeftView.IsDataValid() && m_ProfileRightView.IsDataValid())
+                    {
+                        bool lastEnabled = GUI.enabled;
+                        GUI.enabled = !IsAnalysisRunning();
+                        if (GUILayout.Button(new GUIContent("Compare", m_LastCompareTime), GUILayout.Width(100)))
+                            m_RequestCompare = true;
+                        GUI.enabled = lastEnabled;
+                    }
+
+                    DrawMarkerCount();
+                    EditorGUILayout.LabelField(",", GUILayout.Width(10), GUILayout.ExpandWidth(false));
+                    DrawThreadCount();
+                    GUILayout.FlexibleSpace();
+                    DrawMarkerColumnFilter();
+                    EditorGUILayout.EndHorizontal();
+                }
+
+                if (m_ShowFilters != lastShowFilters)
+                {
+                    ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Filters,
+                        analytic.GetDurationInSeconds(), m_ShowFilters);
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawComparisonProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawComparison");
+        static readonly ProfilerMarkerAbstracted m_DrawComparisonTableProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawComparisonTable");
+
+        void DrawComparison()
+        {
+            using (m_DrawComparisonProfilerMarker.Auto())
+            {
+                EditorGUILayout.BeginHorizontal();
+
+                EditorGUILayout.BeginVertical();
+
+                DrawFilesLoaded();
+
+                if (m_ProfileLeftView.IsDataValid() && m_ProfileRightView.IsDataValid() &&
+                    m_ProfileLeftView.data.GetFrameCount() > 0 && m_ProfileRightView.data.GetFrameCount() > 0)
+                {
+                    DrawCompareOptions();
+
+                    if (m_ComparisonTable != null)
+                    {
+                        EditorGUILayout.BeginVertical(GUI.skin.box);
+
+                        string title = string.Format("Top {0} markers on median frames", m_TopNBars);
+                        GUIContent markersTitle = new GUIContent(title, Styles.topMarkersTooltip);
+
+                        bool lastShowTopMarkers = m_ShowTopNMarkers;
+                        m_ShowTopNMarkers = BoldFoldout(m_ShowTopNMarkers, markersTitle);
+                        var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                        if (m_ShowTopNMarkers)
+                        {
+                            using (m_TopNMarkersProfilerMarker.Auto())
+                            {
+                                EditorGUILayout.BeginVertical(GUILayout.Height(40));
+                                Rect rect = EditorGUILayout.GetControlRect(GUILayout.ExpandWidth(true),
+                                    GUILayout.ExpandHeight(true));
+                                rect.height = rect.height / 2;
+
+                                var nameFilters = GetNameFilters();
+                                var nameExcludes = GetNameExcludes();
+
+                                m_TopMarkersLeft.SetData(m_ProfileLeftView, m_DepthSliceUI.depthFilter1, nameFilters,
+                                    nameExcludes, m_TimingOption, m_ThreadSelection.selection.Count, m_hideRemovedMarkers);
+                                m_TopMarkersRight.SetData(m_ProfileRightView, m_DepthSliceUI.depthFilter2, nameFilters,
+                                    nameExcludes, m_TimingOption, m_ThreadSelection.selection.Count, m_hideRemovedMarkers);
+
+
+                                float leftRange = m_TopMarkersLeft.GetTopMarkerTimeRange();
+                                float rightRange = m_TopMarkersRight.GetTopMarkerTimeRange();
+                                if (m_TopTenDisplay == TopTenDisplay.LongestTime)
+                                {
+                                    float max = Math.Max(leftRange, rightRange);
+                                    leftRange = max;
+                                    rightRange = max;
+                                }
+
+                                int leftMedian = 0;
+                                int rightMedian = 0;
+                                if (m_ProfileLeftView.analysis != null)
+                                {
+                                    FrameSummary frameSummary = m_ProfileLeftView.analysis.GetFrameSummary();
+                                    if (frameSummary.count > 0)
+                                        leftMedian = frameSummary.medianFrameIndex;
+                                }
+
+                                if (m_ProfileRightView.analysis != null)
+                                {
+                                    FrameSummary frameSummary = m_ProfileRightView.analysis.GetFrameSummary();
+                                    if (frameSummary.count > 0)
+                                        rightMedian = frameSummary.medianFrameIndex;
+                                }
+
+                                int maxMedian = Math.Max(leftMedian, rightMedian);
+
+                                Rect frameIndexRect = new Rect(rect);
+                                Vector2 size =
+                                    GUI.skin.button.CalcSize(new GUIContent(string.Format("{0}", maxMedian)));
+                                frameIndexRect.width =
+                                    Math.Max(size.x, 50); // DrawFrameIndexButton should always be at least 50 wide
+
+                                if (leftMedian != 0f)
+                                    DrawFrameIndexButton(frameIndexRect, leftMedian, m_ProfileLeftView);
+                                else
+                                    GUI.Label(frameIndexRect, "");
+
+                                float padding = 2;
+                                rect.x += frameIndexRect.width + padding;
+                                rect.width -= frameIndexRect.width;
+                                m_TopMarkersLeft.Draw(rect, UIColor.left, m_TopNBars, leftRange, UIColor.barBackground,
+                                    Color.black, Color.white, true, true);
+                                rect.y += rect.height;
+
+                                frameIndexRect.y += rect.height;
+                                if (rightMedian != 0f)
+                                    DrawFrameIndexButton(frameIndexRect, rightMedian, m_ProfileRightView);
+                                else
+                                    GUI.Label(frameIndexRect, "");
+
+                                m_TopMarkersRight.Draw(rect, UIColor.right, m_TopNBars, rightRange,
+                                    UIColor.barBackground,
+                                    Color.black, Color.white, true, true);
+                                EditorGUILayout.EndVertical();
+
+                                EditorGUILayout.BeginHorizontal();
+                                GUILayout.Label(m_DepthSliceUI.GetUIInfo(true), GUILayout.ExpandWidth(true));
+                                GUILayout.Label(Styles.topMarkerRatio, GUILayout.ExpandWidth(false));
+                                m_TopTenDisplay = (TopTenDisplay)EditorGUILayout.Popup((int)m_TopTenDisplay, Styles.topTenDisplayOptions, GUILayout.MaxWidth(100));
+                                EditorGUILayout.EndHorizontal();
+                            }
+                        }
+
+                        if (m_ShowTopNMarkers != lastShowTopMarkers)
+                        {
+                            ProfileAnalyzerAnalytics.SendUIVisibilityEvent(
+                                ProfileAnalyzerAnalytics.UIVisibility.Markers, analytic.GetDurationInSeconds(),
+                                m_ShowTopNMarkers);
+                        }
+
+                        EditorGUILayout.EndVertical();
+
+                        if (m_ComparisonTable != null)
+                        {
+                            m_ShowMarkerTable = BoldFoldout(m_ShowMarkerTable, Styles.comparisonTable);
+                            if (m_ShowMarkerTable)
+                            {
+                                using (m_DrawComparisonTableProfilerMarker.Auto())
+                                {
+                                    Rect r = EditorGUILayout.GetControlRect(GUILayout.ExpandHeight(true));
+
+                                    float scrollBarWidth = GUI.skin.verticalScrollbar.fixedWidth +
+                                        GUI.skin.verticalScrollbar.border.horizontal +
+                                        GUI.skin.verticalScrollbar.margin.horizontal +
+                                        GUI.skin.verticalScrollbar.padding.horizontal;
+                                    scrollBarWidth += LayoutSize.ScrollBarPadding;
+
+                                    //offset vertically to get correct clipping behaviour
+                                    Rect clipRect = new Rect(r.x, m_ComparisonTable.state.scrollPos.y,
+                                        r.width - scrollBarWidth,
+                                        r.height - (m_ComparisonTable.multiColumnHeader.height + GUI.skin.box.padding.top) -
+                                        (m_ComparisonTable.ShowingHorizontalScroll
+                                            ? (scrollBarWidth - LayoutSize.ScrollBarPadding)
+                                            : 0));
+                                    m_2D.SetClipRect(clipRect);
+                                    m_ComparisonTable.OnGUI(r);
+                                    m_2D.ClearClipRect();
+                                }
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    ShowHelp();
+                }
+
+                EditorGUILayout.EndVertical();
+
+                EditorGUILayout.BeginVertical(GUILayout.Width(LayoutSize.WidthRHS));
+                GUILayout.Space(4);
+                DrawComparisonFrameSummary();
+                DrawComparisonThreadSummary();
+                DrawComparisonSelected();
+                EditorGUILayout.EndVertical();
+
+                EditorGUILayout.EndHorizontal();
+            }
+        }
+
+        bool BoldFoldout(bool toggle, GUIContent content)
+        {
+            GUIStyle foldoutStyle = new GUIStyle(EditorStyles.foldout);
+            foldoutStyle.fontStyle = FontStyle.Bold;
+            return EditorGUILayout.Foldout(toggle, content, true, foldoutStyle);
+        }
+
+        void DrawComparisonSelectedStats(MarkerData leftMarker, MarkerData rightMarker)
+        {
+            GUIStyle style = GUI.skin.label;
+
+            string units = GetDisplayUnits();
+            m_Columns.Draw4("", units, units, units);
+            Draw4DiffMs(Styles.max, MarkerData.GetMsMax(leftMarker), MarkerData.GetMaxFrameIndex(leftMarker), MarkerData.GetMsMax(rightMarker), MarkerData.GetMaxFrameIndex(rightMarker));
+            Draw4DiffMs(Styles.upperQuartile, MarkerData.GetMsUpperQuartile(leftMarker), MarkerData.GetMsUpperQuartile(rightMarker));
+            Draw4DiffMs(Styles.median, MarkerData.GetMsMedian(leftMarker), MarkerData.GetMedianFrameIndex(leftMarker), MarkerData.GetMsMedian(rightMarker), MarkerData.GetMedianFrameIndex(rightMarker));
+            Draw4DiffMs(Styles.mean, MarkerData.GetMsMean(leftMarker), MarkerData.GetMsMean(rightMarker));
+            Draw4DiffMs(Styles.lowerQuartile, MarkerData.GetMsLowerQuartile(leftMarker), MarkerData.GetMsLowerQuartile(rightMarker));
+            Draw4DiffMs(Styles.min, MarkerData.GetMsMin(leftMarker), MarkerData.GetMinFrameIndex(leftMarker), MarkerData.GetMsMin(rightMarker), MarkerData.GetMinFrameIndex(rightMarker));
+
+            GUILayout.Space(style.lineHeight);
+
+            Draw4DiffMs(Styles.individualMax, MarkerData.GetMsMaxIndividual(leftMarker), MarkerData.GetMsMaxIndividual(rightMarker));
+            Draw4DiffMs(Styles.individualMin, MarkerData.GetMsMinIndividual(leftMarker), MarkerData.GetMsMinIndividual(rightMarker));
+        }
+
+        void DrawComparisonSelected()
+        {
+            EditorGUILayout.BeginVertical(GUI.skin.box, GUILayout.Width(LayoutSize.WidthRHS));
+
+            GUIStyle style = GUI.skin.label;
+
+            bool lastMarkerSummary = m_ShowMarkerSummary;
+            m_ShowMarkerSummary = BoldFoldout(m_ShowMarkerSummary, Styles.markerSummary);
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            if (m_ShowMarkerSummary)
+            {
+                EditorGUILayout.BeginVertical(); // To match indenting on the marker summary where a scroll area is present
+
+                if (IsAnalysisValid())
+                {
+                    List<MarkerData> leftMarkers = m_ProfileLeftView.analysis.GetMarkers();
+                    List<MarkerData> rightMarkers = m_ProfileRightView.analysis.GetMarkers();
+                    int pairingAt = m_SelectedPairing;
+                    if (leftMarkers != null && rightMarkers != null && m_Pairings != null)
+                    {
+                        if (pairingAt >= 0 && pairingAt < m_Pairings.Count)
+                        {
+                            m_MarkerSummaryScroll = GUILayout.BeginScrollView(m_MarkerSummaryScroll, GUIStyle.none, GUI.skin.verticalScrollbar);
+                            Rect clipRect = new Rect(m_MarkerSummaryScroll.x, m_MarkerSummaryScroll.y, LayoutSize.WidthRHS, 500);
+                            m_2D.SetClipRect(clipRect);
+
+                            EditorGUILayout.BeginVertical();
+
+                            var pairing = m_Pairings[pairingAt];
+
+                            var leftMarker = (pairing.leftIndex >= 0 && pairing.leftIndex < leftMarkers.Count) ? leftMarkers[pairing.leftIndex] : null;
+                            var rightMarker = (pairing.rightIndex >= 0 && pairing.rightIndex < rightMarkers.Count) ? rightMarkers[pairing.rightIndex] : null;
+
+                            EditorGUILayout.LabelField(pairing.name,
+                                GUILayout.MaxWidth(LayoutSize.WidthRHS -
+                                    (GUI.skin.box.padding.horizontal + GUI.skin.box.margin.horizontal)));
+                            DrawComparisonFrameRatio(leftMarker, rightMarker);
+
+                            m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+
+                            EditorGUILayout.BeginHorizontal();
+                            m_Columns.Draw(0, Styles.firstFrame);
+                            if (leftMarker != null)
+                                DrawFrameIndexButton(leftMarker.firstFrameIndex, m_ProfileLeftView);
+                            else
+                                m_Columns.Draw(1, Styles.emptyString);
+                            if (rightMarker != null)
+                                DrawFrameIndexButton(rightMarker.firstFrameIndex, m_ProfileRightView);
+                            else
+                                m_Columns.Draw(2, Styles.emptyString);
+                            EditorGUILayout.EndHorizontal();
+
+                            DrawTopComparison(leftMarker, rightMarker);
+
+                            GUILayout.Space(style.lineHeight);
+
+                            EditorGUILayout.BeginHorizontal();
+
+                            int leftBucketCount = leftMarker != null ? leftMarker.buckets.Length : 0;
+                            int rightBucketCount = rightMarker != null ? rightMarker.buckets.Length : 0;
+
+                            float leftMin = MarkerData.GetMsMin(leftMarker);
+                            float rightMin = MarkerData.GetMsMin(rightMarker);
+
+                            float leftMax = MarkerData.GetMsMax(leftMarker);
+                            float rightMax = MarkerData.GetMsMax(rightMarker);
+
+                            int[] leftBuckets = leftMarker != null ? leftMarker.buckets : new int[0];
+                            int[] rightBuckets = rightMarker != null ? rightMarker.buckets : new int[0];
+
+                            Units units = m_DisplayUnits.Units;
+                            string unitName = "marker time";
+                            if (DisplayCount())
+                            {
+                                units = Units.Count;
+                                unitName = "count";
+
+                                leftBucketCount = leftMarker != null ? leftMarker.countBuckets.Length : 0;
+                                rightBucketCount = rightMarker != null ? rightMarker.countBuckets.Length : 0;
+
+                                leftMin = MarkerData.GetCountMin(leftMarker);
+                                rightMin = MarkerData.GetCountMin(rightMarker);
+
+                                leftMax = MarkerData.GetCountMax(leftMarker);
+                                rightMax = MarkerData.GetCountMax(rightMarker);
+
+                                leftBuckets = leftMarker != null ? leftMarker.countBuckets : new int[0];
+                                rightBuckets = rightMarker != null ? rightMarker.countBuckets : new int[0];
+                            }
+
+                            DisplayUnits displayUnits = new DisplayUnits(units);
+
+                            float minValue;
+                            float maxValue;
+                            if (leftMarker != null && rightMarker != null)
+                            {
+                                minValue = Math.Min(leftMin, rightMin);
+                                maxValue = Math.Max(leftMax, rightMax);
+                            }
+                            else if (leftMarker != null)
+                            {
+                                minValue = leftMin;
+                                maxValue = leftMax;
+                            }
+                            else // Either valid or 0
+                            {
+                                minValue = rightMin;
+                                maxValue = rightMax;
+                            }
+
+                            if (leftBucketCount > 0 && rightBucketCount > 0 && leftBucketCount != rightBucketCount)
+                            {
+                                Debug.Log("Error - number of buckets doesn't match in the left and right marker analysis");
+                            }
+                            else
+                            {
+                                int bucketCount = Math.Max(leftBucketCount, rightBucketCount);
+                                int leftFrameCount = MarkerData.GetPresentOnFrameCount(leftMarker);
+                                int rightFrameCount = MarkerData.GetPresentOnFrameCount(rightMarker);
+
+                                DrawComparisonHistogram(100, minValue, maxValue, bucketCount, leftBuckets, rightBuckets, leftFrameCount, rightFrameCount, leftMarker != null, rightMarker != null, displayUnits);
+                            }
+
+                            float plotWidth = 40 + GUI.skin.box.padding.horizontal;
+                            float plotHeight = 100;
+                            plotWidth /= 2.0f;
+                            BoxAndWhiskerPlot boxAndWhiskerPlot = new BoxAndWhiskerPlot(m_2D, units);
+                            DrawBoxAndWhiskerPlotForMarker(boxAndWhiskerPlot, plotWidth, plotHeight, m_ProfileLeftView.analysis, leftMarker, minValue, maxValue,
+                                UIColor.boxAndWhiskerLineColorLeft, UIColor.boxAndWhiskerBoxColorLeft);
+                            DrawBoxAndWhiskerPlotForMarker(boxAndWhiskerPlot, plotWidth, plotHeight, m_ProfileRightView.analysis, rightMarker, minValue, maxValue,
+                                UIColor.boxAndWhiskerLineColorRight, UIColor.boxAndWhiskerBoxColorRight);
+
+                            boxAndWhiskerPlot.DrawText(m_Columns.GetColumnWidth(3), plotHeight, minValue, maxValue,
+                                string.Format("Min {0} for selected frames in the 2 data sets", unitName),
+                                string.Format("Max {0} for selected frames in the 2 data sets", unitName));
+
+                            EditorGUILayout.EndHorizontal();
+
+                            GUILayout.Space(style.lineHeight);
+
+                            DrawComparisonSelectedStats(leftMarker, rightMarker);
+
+                            EditorGUILayout.EndVertical();
+
+                            m_2D.ClearClipRect();
+                            GUILayout.EndScrollView();
+                        }
+                        else
+                        {
+                            EditorGUILayout.LabelField("Marker not in selection");
+                        }
+                    }
+                }
+                else
+                {
+                    EditorGUILayout.LabelField("No marker data selected");
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+
+            if (m_ShowMarkerSummary != lastMarkerSummary)
+            {
+                ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Markers, analytic.GetDurationInSeconds(), m_ShowMarkerSummary);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void SelectTab(ActiveTab newTab)
+        {
+            m_NextActiveTab = newTab;
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawToolbarProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.DrawToolbar");
+
+        void DrawToolbar()
+        {
+            using (m_DrawToolbarProfilerMarker.Auto())
+            {
+                EditorGUILayout.BeginHorizontal(EditorStyles.toolbar);
+
+                EditorGUILayout.LabelField("Mode:", GUILayout.Width(40));
+                ActiveTab newTab = (ActiveTab)GUILayout.Toolbar((int)m_ActiveTab, new string[] {"Single", "Compare"},
+                    EditorStyles.toolbarButton, GUILayout.ExpandWidth(false));
+                if (newTab != m_ActiveTab)
+                {
+                    SelectTab(newTab);
+                }
+
+                //GUILayout.FlexibleSpace();
+                EditorGUILayout.Separator();
+                bool lastEnabled = GUI.enabled;
+                bool enabled = GUI.enabled;
+                if (m_ProfileSingleView.IsDataValid() ||
+                    (m_ProfileLeftView.IsDataValid() && m_ProfileRightView.IsDataValid()))
+                    GUI.enabled = true;
+                else
+                    GUI.enabled = false;
+                if (GUILayout.Button(Styles.export, EditorStyles.toolbarButton, GUILayout.Width(50)))
+                {
+                    Vector2 windowPosition = new Vector2(Event.current.mousePosition.x,
+                        Event.current.mousePosition.y + GUI.skin.label.lineHeight);
+                    Vector2 screenPosition = GUIUtility.GUIToScreenPoint(windowPosition);
+
+                    ProfileAnalyzerExportWindow.Open(screenPosition.x, screenPosition.y, m_ProfileSingleView,
+                        m_ProfileLeftView, m_ProfileRightView, this);
+
+                    EditorGUIUtility.ExitGUI();
+                }
+
+                GUI.enabled = lastEnabled;
+
+                bool profilerOpen = IsProfilerWindowOpen();
+                if (!profilerOpen)
+                {
+                    if (GUILayout.Toggle(profilerOpen, "Open Profiler Window", EditorStyles.toolbarButton,
+                        GUILayout.ExpandWidth(false)) == true)
+                    {
+                        var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                        m_ProfilerWindowInterface.OpenProfilerOrUseExisting();
+                        ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.OpenProfiler,
+                            analytic);
+                        EditorGUIUtility.ExitGUI();
+                    }
+                }
+                else
+                {
+                    if (GUILayout.Toggle(profilerOpen, "Close Profiler Window", EditorStyles.toolbarButton,
+                        GUILayout.ExpandWidth(false)) == false)
+                    {
+                        var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+                        m_ProfilerWindowInterface.CloseProfiler();
+                        ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.CloseProfiler,
+                            analytic);
+                        EditorGUIUtility.ExitGUI();
+                    }
+                }
+
+                EditorGUILayout.Separator();
+
+                GUILayout.FlexibleSpace();
+
+                EditorGUILayout.EndHorizontal();
+            }
+        }
+
+        void SetupStyles()
+        {
+            if (!m_StylesSetup)
+            {
+                m_StyleMiddleRight = new GUIStyle(GUI.skin.label);
+                m_StyleMiddleRight.alignment = TextAnchor.MiddleRight;
+
+                m_StyleUpperLeft = new GUIStyle(GUI.skin.label);
+                m_StyleUpperLeft.alignment = TextAnchor.UpperLeft;
+
+                m_StylesSetup = true;
+            }
+        }
+
+        static readonly ProfilerMarkerAbstracted m_DrawProfilerMarker = new ProfilerMarkerAbstracted("ProfileAnalyzer.Draw");
+
+        void Draw()
+        {
+            // Make sure we start enabled (in case something overrode it last frame)
+            GUI.enabled = true;
+
+            using (m_DrawProfilerMarker.Auto())
+            {
+                SetupStyles();
+
+                EditorGUILayout.BeginVertical();
+
+                DrawToolbar();
+
+                switch (m_ActiveTab)
+                {
+                    case ActiveTab.Summary:
+                        DrawAnalysis();
+                        break;
+                    case ActiveTab.Compare:
+                        DrawComparison();
+                        break;
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+        }
+
+        int FindSelectionByName(List<MarkerData> markers, string name)
+        {
+            int index = 0;
+            foreach (var marker in markers)
+            {
+                if (marker.name == name)
+                    return index;
+                index++;
+            }
+            return -1; // not found
+        }
+
+        /// <summary>
+        /// Select marker to focus on
+        /// </summary>
+        /// <param name="name">Name of the marker</param>
+        // Version 1.0 of the package exposed this API so we can't remove it until we increment the major package version.
+        public void SelectMarker(string name)
+        {
+            SelectMarker(name, null, null);
+        }
+
+        void SelectMarker(string name, string threadGroupName = null, string threadName = null)
+        {
+            switch (m_ActiveTab)
+            {
+                case ActiveTab.Summary:
+                    SelectMarkerByName(name, threadGroupName, threadName);
+                    break;
+                case ActiveTab.Compare:
+                    SelectPairingByName(name, threadGroupName, threadName);
+                    break;
+            }
+        }
+
+        void UpdateSelectedMarkerName(string markerName)
+        {
+            m_SelectedMarker.name = markerName;
+
+            // only update the Profiler Window if it wasn't updated successfully with this marker yet.
+            if (m_LastMarkerSuccesfullySyncedWithProfilerWindow == markerName)
+                return;
+            var updatedSelectedSampleSuccesfully = false;
+            if (m_ProfilerWindowInterface.IsReady() && !m_SelectionEventFromProfilerWindowInProgress && m_ThreadSelection.selection != null && m_ThreadSelection.selection.Count > 0)
+            {
+                updatedSelectedSampleSuccesfully = m_ProfilerWindowInterface.SetProfilerWindowMarkerName(markerName, m_ThreadSelection.selection);
+            }
+            if (updatedSelectedSampleSuccesfully)
+                m_LastMarkerSuccesfullySyncedWithProfilerWindow = markerName;
+        }
+
+        internal void SelectMarkerByIndex(int index, string markerNameFallback = null, string threadGroupName = null, string threadName = null)
+        {
+            if (m_ProfileSingleView == null || m_ProfileSingleView.analysis == null)
+                return;
+
+
+            // Check if this marker is in the 'filtered' list
+            var markers = m_ProfileSingleView.analysis.GetMarkers();
+            if (markers.Count <= 0)
+                return;
+
+            bool valid = true;
+            if (index >= 0 && index < markers.Count)
+            {
+                var marker = markers[index];
+                valid = DoesMarkerPassFilter(marker.name);
+            }
+
+            m_SelectedMarker.id = index;
+
+            if (m_ProfileTable != null)
+            {
+                List<int> selection = new List<int>();
+                if (index >= 0 && valid)
+                    selection.Add(index);
+                m_ProfileTable.SetSelection(selection, TreeViewSelectionOptions.RevealAndFrame);
+            }
+
+            var markerName = GetMarkerName(index);
+
+            if (index == -1 && !string.IsNullOrEmpty(markerNameFallback))
+            {
+                markerName = markerNameFallback;
+                if (!string.IsNullOrEmpty(threadName))
+                {
+                    m_SelectedMarker.threadGroupName = threadGroupName;
+                    m_SelectedMarker.threadName = threadName;
+                }
+                else
+                {
+                    m_SelectedMarker.threadGroupName = null;
+                    m_SelectedMarker.threadName = null;
+                }
+            }
+            else
+            {
+                m_SelectedMarker.threadGroupName = null;
+                m_SelectedMarker.threadName = null;
+            }
+
+            if (markerName != null)
+                UpdateSelectedMarkerName(markerName);
+        }
+
+        /// <summary>
+        /// Get currently selected marker
+        /// </summary>
+        /// <returns>Name of currently selected marker, or null if none selected</returns>
+        public string GetSelectedMarkerName()
+        {
+            switch (m_ActiveTab)
+            {
+                case ActiveTab.Summary:
+                    return GetMarkerName(m_SelectedMarker.id);
+                case ActiveTab.Compare:
+                    return GetPairingName(m_SelectedPairing);
+            }
+
+            return null;
+        }
+
+        string GetMarkerName(int index)
+        {
+            if (m_ProfileSingleView.analysis == null)
+                return null;
+
+            var marker = m_ProfileSingleView.analysis.GetMarker(index);
+            if (marker == null)
+                return null;
+
+            return marker.name;
+        }
+
+        void SelectMarkerByName(string markerName, string threadGroupName = null, string threadName = null)
+        {
+            int index = (m_ProfileSingleView.analysis != null) ? m_ProfileSingleView.analysis.GetMarkerIndexByName(markerName) : -1;
+
+            SelectMarkerByIndex(index, markerName, threadGroupName, threadName);
+        }
+
+        internal void SelectPairing(int index, string threadGroupName = null, string threadName = null)
+        {
+            if (m_Pairings == null || m_Pairings.Count == 0)
+                return;
+
+            // Check if this marker is in the 'filtered' list
+            bool valid = true;
+            if (index >= 0 && index < m_Pairings.Count)
+            {
+                var pairing = m_Pairings[index];
+                valid = DoesMarkerPassFilter(pairing.name);
+            }
+
+            m_SelectedPairing = index;
+
+            if (m_ComparisonTable != null)
+            {
+                List<int> selection = new List<int>();
+                if (index >= 0 && valid)
+                    selection.Add(index);
+                m_ComparisonTable.SetSelection(selection, TreeViewSelectionOptions.RevealAndFrame);
+            }
+
+            var markerName = GetPairingName(index);
+            if (markerName != null)
+                UpdateSelectedMarkerName(markerName);
+        }
+
+        string GetPairingName(int index)
+        {
+            if (m_Pairings == null)
+                return null;
+
+            if (index < 0 || index >= m_Pairings.Count)
+                return null;
+
+            return m_Pairings[index].name;
+        }
+
+        void SelectPairingByName(string pairingName, string threadGroupName = null, string threadName = null)
+        {
+            if (m_Pairings != null && pairingName != null)
+            {
+                for (int index = 0; index < m_Pairings.Count; index++)
+                {
+                    var pairing = m_Pairings[index];
+                    if (pairing.name == pairingName)
+                    {
+                        SelectPairing(index, threadGroupName, threadName);
+                        return;
+                    }
+                }
+            }
+
+            SelectPairing(-1, threadGroupName, threadName);
+        }
+
+        GUIContent GetFrameCountText(ProfileDataView context)
+        {
+            var frameSummary = context.analysis.GetFrameSummary();
+
+            string text;
+            string tooltip;
+            if (frameSummary.first == frameSummary.last)
+            {
+                text = string.Format("{0}", frameSummary.count);
+                tooltip = "";
+            }
+            else
+            {
+                int rangeSize = (1 + (frameSummary.last - frameSummary.first));
+                if (frameSummary.count == rangeSize)
+                {
+                    text = string.Format("{0}", frameSummary.count);
+                    tooltip = string.Format("{0} frames selected\n\n{1} first selected frame\n{2} last selected frame\n\nConsecutive Sequence"
+                        , frameSummary.count
+                        , GetRemappedUIFrameIndex(frameSummary.first, context)
+                        , GetRemappedUIFrameIndex(frameSummary.last, context));
+                }
+                else
+                {
+                    text = string.Format("{0}*", frameSummary.count);
+                    var ranges = RangesText(context);
+                    tooltip = string.Format("{0} frames selected\n\nframe ranges: {1} \n\nNot a consecutive sequence", frameSummary.count, ranges);
+                }
+            }
+
+            return new GUIContent(text, tooltip);
+        }
+
+        string RangesText(ProfileDataView context)
+        {
+            var sortedFrames = context.analysis.GetFrameSummary().frames.OrderBy(x => x.frameIndex).ToArray();
+
+            var ranges = "";
+            int lastAdded = GetRemappedUIFrameIndex(sortedFrames[0].frameIndex, context);
+            ranges += lastAdded;
+
+            for (int n = 1; n < sortedFrames.Length; ++n)
+            {
+                if (sortedFrames[n].frameIndex == (sortedFrames[n - 1].frameIndex + 1)) continue;
+
+                int nIdx = GetRemappedUIFrameIndex(sortedFrames[n].frameIndex, context);
+                int pNIdx = GetRemappedUIFrameIndex(sortedFrames[n - 1].frameIndex, context);
+
+                if (lastAdded == pNIdx)
+                {
+                    ranges += ", " + nIdx;
+                }
+                else
+                {
+                    ranges += "-" + pNIdx + ", " + nIdx;
+                }
+
+                lastAdded = nIdx;
+            }
+
+            int remappedLastFrame = GetRemappedUIFrameIndex(sortedFrames.Last().frameIndex, context);
+            if (lastAdded == remappedLastFrame)
+                return ranges;
+
+            ranges += "-" + remappedLastFrame;
+            return ranges;
+        }
+
+        GUIContent GetFirstFrameText(ProfileDataView context)
+        {
+            var frameSummary = context.analysis.GetFrameSummary();
+
+            string text;
+            string tooltip;
+            if (frameSummary.count == 0)
+            {
+                text = "";
+                tooltip = "";
+            }
+            else if (frameSummary.first == frameSummary.last)
+            {
+                int remappedFrame = GetRemappedUIFrameIndex(frameSummary.first, context);
+                text = string.Format("{0}", remappedFrame);
+                tooltip = string.Format("Frame {0} selected", remappedFrame);
+            }
+            else
+            {
+                int rangeSize = (1 + (frameSummary.last - frameSummary.first));
+                if (frameSummary.count == rangeSize)
+                {
+                    int remappedFirstFrame = GetRemappedUIFrameIndex(frameSummary.first, context);
+                    text = string.Format("{0}", remappedFirstFrame);
+                    tooltip = string.Format("{0} frames selected\n\n{1} first selected frame\n{2} last selected frame\n\nConsecutive Sequence"
+                        , frameSummary.count
+                        , remappedFirstFrame
+                        , GetRemappedUIFrameIndex(frameSummary.last, context));
+                }
+                else
+                {
+                    text = string.Format("{0}*", GetRemappedUIFrameIndex(frameSummary.first, context));
+                    var ranges = RangesText(context);
+                    tooltip = string.Format("{0} frames selected\n\nframe ranges: {1} \n\nNot a consecutive sequence", frameSummary.count, ranges);
+                }
+            }
+
+            return new GUIContent(text, tooltip);
+        }
+
+        GUIContent GetLastFrameText(ProfileDataView context)
+        {
+            var frameSummary =  context.analysis.GetFrameSummary();
+
+            string text;
+            string tooltip;
+            if (frameSummary.count == 0)
+            {
+                text = "";
+                tooltip = "";
+            }
+            else if (frameSummary.first == frameSummary.last)
+            {
+                text = "";
+                tooltip = string.Format("Frame {0} selected", GetRemappedUIFrameIndex(frameSummary.first, context), context);
+            }
+            else
+            {
+                int rangeSize = (1 + (frameSummary.last - frameSummary.first));
+                if (frameSummary.count == rangeSize)
+                {
+                    int remappedLastFrame = GetRemappedUIFrameIndex(frameSummary.last, context);
+                    text = string.Format("{0}", remappedLastFrame);
+                    tooltip = string.Format("{0} frames selected\n\n{1} first selected frame\n{2} last selected frame\n\nConsecutive Sequence",
+                        frameSummary.count,
+                        GetRemappedUIFrameIndex(frameSummary.first, context),
+                        remappedLastFrame);
+                }
+                else
+                {
+                    text = string.Format("{0}*", GetRemappedUIFrameIndex(frameSummary.last, context));
+                    var ranges = RangesText(context);
+                    tooltip = string.Format("{0} frames selected\n\nframe ranges: {1} \n\nNot a consecutive sequence", frameSummary.count, ranges);;
+                }
+            }
+
+            return new GUIContent(text, tooltip);
+        }
+
+        void DrawFrameSummary()
+        {
+            EditorGUILayout.BeginVertical(GUI.skin.box, GUILayout.Width(LayoutSize.WidthRHS));
+
+            bool lastShowFrameSummary = m_ShowFrameSummary;
+            m_ShowFrameSummary = BoldFoldout(m_ShowFrameSummary, Styles.frameSummary);
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            if (m_ShowFrameSummary)
+            {
+                EditorGUILayout.BeginVertical(); // To match indenting on the marker summary where a scroll area is present
+
+                if (IsAnalysisValid())
+                {
+                    var frameSummary = m_ProfileSingleView.analysis.GetFrameSummary();
+
+                    m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+                    m_Columns.Draw(0, "");
+
+                    m_Columns.Draw2(Styles.frameCount, GetFrameCountText(m_ProfileSingleView));
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw(0, Styles.frameStart);
+                    GUIContent firstFrameTextContent = GetFirstFrameText(m_ProfileSingleView);
+                    m_Columns.Draw(1, firstFrameTextContent);
+                    if (firstFrameTextContent.text != "")
+                        DrawFrameIndexButton(frameSummary.first, m_ProfileSingleView);
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw(0, Styles.frameEnd);
+                    GUIContent lastFrameTextContent = GetLastFrameText(m_ProfileSingleView);
+                    m_Columns.Draw(1, lastFrameTextContent);
+                    if (lastFrameTextContent.text != "")
+                        DrawFrameIndexButton(frameSummary.last, m_ProfileSingleView);
+                    EditorGUILayout.EndHorizontal();
+
+                    m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+                    m_Columns.Draw(0, "");
+                    m_Columns.Draw3("", GetDisplayUnits(), "Frame");
+
+                    Draw3LabelMsFrame(Styles.max, frameSummary.msMax, frameSummary.maxFrameIndex, m_ProfileSingleView);
+                    Draw2LabelMs(Styles.upperQuartile, frameSummary.msUpperQuartile);
+                    Draw3LabelMsFrame(Styles.median, frameSummary.msMedian, frameSummary.medianFrameIndex, m_ProfileSingleView);
+                    Draw2LabelMs(Styles.mean, frameSummary.msMean);
+                    Draw2LabelMs(Styles.lowerQuartile, frameSummary.msLowerQuartile);
+                    Draw3LabelMsFrame(Styles.min, frameSummary.msMin, frameSummary.minFrameIndex, m_ProfileSingleView);
+
+                    GUIStyle style = GUI.skin.label;
+                    GUILayout.Space(style.lineHeight);
+
+                    EditorGUILayout.BeginHorizontal();
+                    Histogram histogram = new Histogram(m_2D, m_DisplayUnits.Units);
+                    histogram.Draw(LayoutSize.HistogramWidth, 40, frameSummary.buckets, frameSummary.count, 0, frameSummary.msMax, UIColor.bar);
+
+                    BoxAndWhiskerPlot boxAndWhiskerPlot = new BoxAndWhiskerPlot(m_2D, m_DisplayUnits.Units);
+
+                    float plotWidth = 40 + GUI.skin.box.padding.horizontal;
+                    float plotHeight = 40;
+                    boxAndWhiskerPlot.Draw(plotWidth, plotHeight, frameSummary.msMin, frameSummary.msLowerQuartile, frameSummary.msMedian, frameSummary.msUpperQuartile, frameSummary.msMax, 0, frameSummary.msMax, UIColor.standardLine, UIColor.standardLine);
+
+                    boxAndWhiskerPlot.DrawText(m_Columns.GetColumnWidth(3), plotHeight, frameSummary.msMin, frameSummary.msMax,
+                        "Min frame time for selected frames",
+                        "Max frame time for selected frames");
+
+                    EditorGUILayout.EndHorizontal();
+                }
+                else
+                {
+                    EditorGUILayout.LabelField("No analysis data selected");
+                }
+
+                EditorGUILayout.EndVertical();
+            }
+
+            if (m_ShowFrameSummary != lastShowFrameSummary)
+            {
+                ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Frames, analytic.GetDurationInSeconds(), m_ShowFrameSummary);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        GUIContent GetThreadNameWithGroupTooltip(string threadNameWithIndex, bool singleThread)
+        {
+            string friendlyThreadName = GetFriendlyThreadName(threadNameWithIndex, singleThread);
+            string groupName;
+            friendlyThreadName = ProfileData.GetThreadNameWithoutGroup(friendlyThreadName, out groupName);
+
+            if (groupName == "")
+                return new GUIContent(friendlyThreadName, string.Format("{0}", friendlyThreadName));
+            else
+                return new GUIContent(friendlyThreadName, string.Format("{0}\n{1}", friendlyThreadName, groupName));
+        }
+
+        void DrawThreadSummary()
+        {
+            EditorGUILayout.BeginVertical(GUI.skin.box, GUILayout.Width(LayoutSize.WidthRHS));
+
+            bool lastShowThreadSummary = m_ShowThreadSummary;
+            m_ShowThreadSummary = BoldFoldout(m_ShowThreadSummary, Styles.threadSummary);
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            if (m_ShowThreadSummary)
+            {
+                EditorGUILayout.BeginVertical(); // To match indenting on the marker summary where a scroll area is present
+                if (IsAnalysisValid())
+                {
+                    float xAxisMin = 0.0f;
+                    float xAxisMax = GetThreadTimeRange(m_ProfileSingleView.analysis);
+
+                    m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw4("", "", "", "");
+                    EditorGUILayout.EndHorizontal();
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw(0, "Total Count : ");
+                    m_Columns.Draw(1, m_ProfileSingleView.data.GetThreadCount().ToString());
+                    EditorGUILayout.EndHorizontal();
+
+                    List<string> threadSelection = GetLimitedThreadSelection(m_ThreadNames, m_ThreadSelection);
+                    int selectedThreads = threadSelection.Count;
+
+                    EditorGUILayout.BeginHorizontal();
+                    m_Columns.Draw(0, "Selected : ");
+                    m_Columns.Draw(1, selectedThreads.ToString());
+                    EditorGUILayout.EndHorizontal();
+                    ShowThreadRange();
+
+                    m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2 + LayoutSize.WidthColumn3, 0);
+                    m_Columns.Draw3("", "Median", "Thread");
+
+                    m_ThreadScroll = EditorGUILayout.BeginScrollView(m_ThreadScroll, GUIStyle.none, GUI.skin.verticalScrollbar);
+                    Rect clipRect = new Rect(m_ThreadScroll.x, m_ThreadScroll.y, m_ThreadsAreaRect.width, m_ThreadsAreaRect.height);
+                    m_2D.SetClipRect(clipRect);
+                    for (int i = 0; i < m_ThreadUINames.Count; i++)
+                    {
+                        string threadNameWithIndex = m_ThreadNames[i];
+                        if (!threadNameWithIndex.Contains(":"))
+                            continue;    // Ignore 'All'
+
+                        bool include = ProfileAnalyzer.MatchThreadFilter(threadNameWithIndex, m_ThreadSelection.selection);
+                        if (!include)
+                            continue;
+
+                        ThreadData thread = m_ProfileSingleView.analysis.GetThreadByName(threadNameWithIndex);
+                        if (thread == null)    // May be the 'all' field
+                            continue;
+
+                        bool singleThread = thread.threadsInGroup > 1 ? false : true;
+
+                        BoxAndWhiskerPlot boxAndWhiskerPlot = new BoxAndWhiskerPlot(m_2D, m_DisplayUnits.Units);
+                        EditorGUILayout.BeginHorizontal();
+                        boxAndWhiskerPlot.DrawHorizontal(100, GUI.skin.label.lineHeight, thread.msMin, thread.msLowerQuartile, thread.msMedian, thread.msUpperQuartile, thread.msMax, xAxisMin, xAxisMax, UIColor.bar, UIColor.barBackground, GUI.skin.label);
+
+                        m_Columns.Draw(1, ToDisplayUnitsWithTooltips(thread.msMedian));
+                        m_Columns.Draw(2, GetThreadNameWithGroupTooltip(thread.threadNameWithIndex, singleThread));
+                        EditorGUILayout.EndHorizontal();
+                    }
+                    m_2D.ClearClipRect();
+                    EditorGUILayout.EndScrollView();
+
+                    if (Event.current.type == EventType.Repaint)
+                    {
+                        // This value is not valid at layout phase
+                        m_ThreadsAreaRect = GUILayoutUtility.GetLastRect();
+                    }
+                }
+                else
+                {
+                    EditorGUILayout.LabelField("No analysis data selected");
+                }
+                EditorGUILayout.EndVertical();
+            }
+
+            if (m_ShowThreadSummary != lastShowThreadSummary)
+            {
+                ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Threads, analytic.GetDurationInSeconds(), m_ShowThreadSummary);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void DrawHistogramForMarker(Histogram histogram, MarkerData marker)
+        {
+            if (DisplayCount())
+                histogram.Draw(LayoutSize.HistogramWidth, 100, marker.countBuckets, marker.presentOnFrameCount, marker.countMin, marker.countMax, UIColor.bar);
+            else
+                histogram.Draw(LayoutSize.HistogramWidth, 100, marker.buckets, marker.presentOnFrameCount, marker.msMin, marker.msMax, UIColor.bar);
+        }
+
+        internal bool IsProfilerWindowOpen()
+        {
+            return m_ProfilerWindowInterface.IsReady();
+        }
+
+        /// <summary>
+        /// Used to remap frame indices when the loaded range in the profiler does not match the range present in the Profile Analyzer capture.
+        /// This happens when we reload data into the Profiler Window as the index range becomes 1 -> n+1
+        /// </summary>
+        /// <param name="frameIndex">target frame index</param>
+        /// <param name="frameIndexOffset">capture frameIndex offset</param>
+        /// <returns></returns>
+        internal int RemapFrameIndex(int frameIndex, int frameIndexOffset)
+        {
+            if (m_ProfilerFirstFrameIndex == 1 && frameIndex > frameIndexOffset)
+                return frameIndex - frameIndexOffset;
+            else
+                return frameIndex;
+        }
+
+        internal void JumpToFrame(int frameIndex, ProfileData frameContext, bool reportErrors = true)
+        {
+            if (!m_ProfilerWindowInterface.IsReady())
+                return;
+
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            m_ProfilerWindowInterface.JumpToFrame(RemapFrameIndex(frameIndex, frameContext.FrameIndexOffset));
+            if (IsSelectedMarkerNameValid())
+                m_ProfilerWindowInterface.SetProfilerWindowMarkerName(m_SelectedMarker.name, m_ThreadSelection.selection);
+            ProfileAnalyzerAnalytics.SendUIButtonEvent(ProfileAnalyzerAnalytics.UIButton.JumpToFrame, analytic);
+        }
+
+        internal float DrawFrameIndexButton(int frameIndex, ProfileDataView frameContext)
+        {
+            float defaultWidth = 50f;
+            if (frameIndex < 0)
+                return defaultWidth;
+
+            bool enabled = GUI.enabled;
+            if (!IsProfilerWindowOpen() || !frameContext.inSyncWithProfilerData)
+                GUI.enabled = false;
+
+            var remappedIndex = GetRemappedUIFrameIndex(frameIndex, frameContext);
+            var content = new GUIContent(string.Format("{0}", remappedIndex), string.Format("Jump to frame {0} in the Unity Profiler", remappedIndex));
+            Vector2 size = GUI.skin.button.CalcSize(content);
+            //float height = size.y;
+            float maxWidth = Math.Max(defaultWidth, size.x);
+            if (GUILayout.Button(content, GUILayout.MinWidth(defaultWidth), GUILayout.MaxWidth(maxWidth)))
+            {
+                JumpToFrame(frameIndex, frameContext.data);
+            }
+
+            GUI.enabled = enabled;
+
+            return maxWidth;
+        }
+
+        internal void DrawFrameIndexButton(Rect rect, int frameIndex, ProfileDataView frameContext)
+        {
+            if (frameIndex < 0)
+                return;
+
+            bool enabled = GUI.enabled;
+            if (!IsProfilerWindowOpen() || !frameContext.inSyncWithProfilerData)
+                GUI.enabled = false;
+
+            // Clamp to max height to match other buttons
+            // And centre vertically if needed
+            var remappedIndex = GetRemappedUIFrameIndex(frameIndex, frameContext);
+            var content = new GUIContent(string.Format("{0}", remappedIndex), string.Format("Jump to frame {0} in the Unity Profiler", remappedIndex));
+            Vector2 size = GUI.skin.button.CalcSize(content);
+            float height = size.y; // was 14
+            rect.y += (rect.height - height) / 2;
+            rect.height = Math.Min(rect.height, height);
+
+            if (GUI.Button(rect, content))
+            {
+                JumpToFrame(frameIndex, frameContext.data);
+            }
+
+            GUI.enabled = enabled;
+        }
+
+        void Draw3LabelMsFrame(GUIContent col1, float ms, int frameIndex, ProfileDataView frameContext)
+        {
+            EditorGUILayout.BeginHorizontal();
+            m_Columns.Draw(0, col1);
+            m_Columns.Draw(1, ToDisplayUnitsWithTooltips(ms));
+            DrawFrameIndexButton(frameIndex, frameContext);
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void Draw2LabelMs(GUIContent col1, float ms)
+        {
+            EditorGUILayout.BeginHorizontal();
+            m_Columns.Draw(0, col1);
+            m_Columns.Draw(1, ToDisplayUnitsWithTooltips(ms));
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void Draw4DiffMs(GUIContent col1, float msLeft, float msRight)
+        {
+            EditorGUILayout.BeginHorizontal();
+            m_Columns.Draw(0, col1);
+            m_Columns.Draw(1, ToDisplayUnitsWithTooltips(msLeft));
+            m_Columns.Draw(2, ToDisplayUnitsWithTooltips(msRight));
+            m_Columns.Draw(3, ToDisplayUnitsWithTooltips(msRight - msLeft));
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void Draw4DiffMs(GUIContent col1, float msLeft, int frameIndexLeft, float msRight, int frameIndexRight)
+        {
+            EditorGUILayout.BeginHorizontal();
+            m_Columns.Draw(0, col1);
+            m_Columns.Draw(1, ToDisplayUnitsWithTooltips(msLeft, false, frameIndexLeft));
+            m_Columns.Draw(2, ToDisplayUnitsWithTooltips(msRight, false, frameIndexRight));
+            m_Columns.Draw(3, ToDisplayUnitsWithTooltips(msRight - msLeft));
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void Draw4Ms(GUIContent col1, float value2, float value3, float value4)
+        {
+            EditorGUILayout.BeginHorizontal();
+            m_Columns.Draw(0, col1);
+            m_Columns.Draw(1, ToDisplayUnitsWithTooltips(value2));
+            m_Columns.Draw(2, ToDisplayUnitsWithTooltips(value3));
+            m_Columns.Draw(3, ToDisplayUnitsWithTooltips(value4));
+            EditorGUILayout.EndHorizontal();
+        }
+
+        void DrawBoxAndWhiskerPlotForMarker(BoxAndWhiskerPlot boxAndWhiskerPlot, float width, float height, ProfileAnalysis analysis, MarkerData marker, float yAxisStart, float yAxisEnd, Color color, Color colorBackground)
+        {
+            if (marker == null)
+            {
+                boxAndWhiskerPlot.Draw(width, height, 0, 0, 0, 0, 0, yAxisStart, yAxisEnd, color, colorBackground);
+                return;
+            }
+
+            if (DisplayCount())
+                boxAndWhiskerPlot.Draw(width, height, marker.countMin, marker.countLowerQuartile, marker.countMedian, marker.countUpperQuartile, marker.countMax, yAxisStart, yAxisEnd, color, colorBackground);
+            else
+                boxAndWhiskerPlot.Draw(width, height, marker.msMin, marker.msLowerQuartile, marker.msMedian, marker.msUpperQuartile, marker.msMax, yAxisStart, yAxisEnd, color, colorBackground);
+        }
+
+        void DrawBoxAndWhiskerPlotHorizontalForMarker(BoxAndWhiskerPlot boxAndWhiskerPlot, float width, float height, ProfileAnalysis analysis, MarkerData marker, float yAxisStart, float yAxisEnd, Color color, Color colorBackground)
+        {
+            boxAndWhiskerPlot.DrawHorizontal(width, height, marker.msMin, marker.msLowerQuartile, marker.msMedian, marker.msUpperQuartile, marker.msMax, yAxisStart, yAxisEnd, color, colorBackground);
+        }
+
+        void DrawFrameRatio(MarkerData marker)
+        {
+            var frameSummary = m_ProfileSingleView.analysis.GetFrameSummary();
+
+            GUIStyle style = GUI.skin.label;
+            float w = LayoutSize.WidthColumn0;
+            float h = style.lineHeight;
+            float ySpacing = 2;
+            float barHeight = h - ySpacing;
+
+            EditorGUILayout.BeginVertical(GUILayout.Width(w + LayoutSize.WidthColumn1 + LayoutSize.WidthColumn2));
+
+            float barMax = frameSummary.msMean;
+            float barValue = marker.msMean;
+            string text = "Mean frame contribution";
+            Units units = m_DisplayUnits.Units;
+            bool removed = marker.timeIgnored > 0;
+            if (DisplayCount())
+            {
+                units = Units.Count;
+                barMax = frameSummary.markerCountMaxMean;
+                barValue = marker.countMean;
+                text = "Mean count";
+            }
+            DisplayUnits displayUnits = new DisplayUnits(units);
+            float barLength = Math.Min((w * barValue) / barMax, w);
+
+            EditorGUILayout.LabelField(text);
+            m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+
+            m_Columns.Draw2("", "");
+
+            EditorGUILayout.BeginHorizontal();
+
+            if (removed)
+            {
+                EditorGUILayout.LabelField("(Marker Removed from analysis)");
+            }
+            else
+            {
+                // NOTE: This can effect the whole width of the region its inside
+                // Not clear why
+                if (m_2D.DrawStart(w, h, Draw2D.Origin.TopLeft, style))
+                {
+                    m_2D.DrawFilledBox(0, ySpacing, barLength, barHeight, UIColor.bar);
+                    m_2D.DrawFilledBox(barLength, ySpacing, w - barLength, barHeight, UIColor.barBackground);
+                    m_2D.DrawEnd();
+
+                    Rect rect = GUILayoutUtility.GetLastRect();
+                    string tooltip = string.Format("{0}", displayUnits.ToString(barValue, true, 5));
+                    GUI.Label(rect, new GUIContent("", tooltip));
+                }
+
+                EditorGUILayout.LabelField(ShowPercent((100 * barValue) / barMax), GUILayout.MaxWidth(50));
+            }
+
+            EditorGUILayout.EndHorizontal();
+
+            EditorGUILayout.EndVertical();
+        }
+
+        GUIContent ShowPercent(float percent)
+        {
+            string text;
+            string tooltip;
+
+            if (percent >= 999.95f)
+            {
+                text = string.Format("{0:f0}%", percent);
+                tooltip = string.Format("{0:f2}%", percent);
+            }
+            else if (percent >= 99.995f)
+            {
+                text = string.Format("{0:f1}%", percent);
+                tooltip = string.Format("{0:f2}%", percent);
+            }
+            else
+            {
+                text = string.Format("{0:f2}%", percent);
+                tooltip = text;
+            }
+
+
+            return new GUIContent(text, tooltip);
+        }
+
+        void DrawComparisonFrameRatio(MarkerData leftMarker, MarkerData rightMarker)
+        {
+            var leftFrameSummary = m_ProfileLeftView.analysis.GetFrameSummary();
+            var rightFrameSummary = m_ProfileRightView.analysis.GetFrameSummary();
+
+            GUIStyle style = GUI.skin.label;
+            float w = LayoutSize.WidthColumn0;
+            float h = style.lineHeight;
+            float ySpacing = 2;
+            float barHeight = (h - ySpacing) / 2;
+
+            EditorGUILayout.BeginVertical(GUILayout.Width(w + LayoutSize.WidthColumn1 + LayoutSize.WidthColumn2));
+
+            float leftBarValue = MarkerData.GetMsMean(leftMarker);
+            float rightBarValue = MarkerData.GetMsMean(rightMarker);
+            float leftBarMax = leftFrameSummary.msMean;
+            float rightBarMax = rightFrameSummary.msMean;
+
+            string text = "Mean frame contribution";
+            Units units = m_DisplayUnits.Units;
+            bool removed = MarkerData.GetTimeIgnored(leftMarker) > 0 || MarkerData.GetTimeIgnored(rightMarker) > 0;
+            if (DisplayCount())
+            {
+                units = Units.Count;
+                leftBarValue = MarkerData.GetCountMean(leftMarker);
+                rightBarValue = MarkerData.GetCountMean(rightMarker);
+                leftBarMax = leftFrameSummary.markerCountMaxMean;
+                rightBarMax = rightFrameSummary.markerCountMaxMean;
+                text = "Mean count";
+            }
+
+            DisplayUnits displayUnits = new DisplayUnits(units);
+
+            float leftBarLength = (leftBarMax > 0) ? (w * leftBarValue) / leftBarMax : 0f;
+            leftBarLength = Math.Min(leftBarLength, w);
+            float rightBarLength = (rightBarMax > 0) ? (w * rightBarValue) / rightBarMax : 0f;
+            rightBarLength = Math.Min(rightBarLength, w);
+
+            EditorGUILayout.LabelField(text);
+            m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+            if (removed)
+                m_Columns.Draw4("", "", "", "");
+            else
+                m_Columns.Draw4("", "Left", "Right", "Diff");
+            EditorGUILayout.BeginHorizontal();
+
+            if (removed)
+            {
+                EditorGUILayout.LabelField("(Marker Removed from analysis)");
+            }
+            else
+            {
+                if (m_2D.DrawStart(w, h, Draw2D.Origin.TopLeft, style))
+                {
+                    m_2D.DrawFilledBox(0, ySpacing, w, h - ySpacing, UIColor.barBackground);
+
+                    m_2D.DrawFilledBox(0, ySpacing, leftBarLength, barHeight, UIColor.left);
+                    m_2D.DrawFilledBox(0, ySpacing + barHeight, rightBarLength, barHeight, UIColor.right);
+                    m_2D.DrawEnd();
+
+                    Rect rect = GUILayoutUtility.GetLastRect();
+                    string tooltip = string.Format("Left: {0}\nRight: {1}", displayUnits.ToTooltipString(leftBarValue, true), displayUnits.ToTooltipString(rightBarValue, true));
+                    GUI.Label(rect, new GUIContent("", tooltip));
+                }
+                float leftPercentage = leftBarMax > 0 ? (100 * leftBarValue) / leftBarMax : 0f;
+                float rightPercentage = rightBarMax > 0 ? (100 * rightBarValue) / rightBarMax : 0f;
+
+                EditorGUILayout.LabelField(ShowPercent(leftPercentage), GUILayout.Width(LayoutSize.WidthColumn1));
+                EditorGUILayout.LabelField(ShowPercent(rightPercentage), GUILayout.Width(LayoutSize.WidthColumn2));
+                if (leftMarker != null && rightMarker != null)
+                    EditorGUILayout.LabelField(ShowPercent(rightPercentage - leftPercentage), GUILayout.Width(LayoutSize.WidthColumn3));
+            }
+            EditorGUILayout.EndHorizontal();
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void DrawTopComparison(MarkerData leftMarker, MarkerData rightMarker)
+        {
+            GUIStyle style = GUI.skin.label;
+            float w = LayoutSize.WidthColumn0;
+            float h = style.lineHeight;
+            float ySpacing = 2;
+            float barHeight = (h - ySpacing) / 2;
+
+            EditorGUILayout.BeginVertical(GUILayout.Width(w + LayoutSize.WidthColumn1 + LayoutSize.WidthColumn2));
+            bool showCount = DisplayCount();
+
+            float leftMax = MarkerData.GetMsMax(leftMarker);
+            float rightMax = MarkerData.GetMsMax(rightMarker);
+
+            Units units = m_DisplayUnits.Units;
+            if (showCount)
+            {
+                units = Units.Count;
+                leftMax = MarkerData.GetCountMax(leftMarker);
+                rightMax = MarkerData.GetCountMax(rightMarker);
+            }
+            DisplayUnits displayUnits = new DisplayUnits(units);
+
+            TopMarkerList topMarkerList = new TopMarkerList(m_2D, units,
+                LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3,
+                UIColor.bar, UIColor.barBackground, DrawFrameIndexButton);
+            m_TopNumber = topMarkerList.DrawTopNumber(m_TopNumber, m_TopStrings, m_TopValues);
+
+            float barMax = Math.Max(leftMax, rightMax);
+
+            List<FrameTime> leftFrames = leftMarker != null ? topMarkerList.GetTopN(leftMarker, m_TopNumber, showCount) : new List<FrameTime>();
+            List<FrameTime> rightFrames = rightMarker != null ? topMarkerList.GetTopN(rightMarker, m_TopNumber, showCount) : new List<FrameTime>();
+
+            FrameTime zeroFrameTime = new FrameTime(-1, 0.0f, 0);
+            for (int i = 0; i < m_TopNumber; i++)
+            {
+                bool leftValid = i < leftFrames.Count;
+                bool rightValid = i < rightFrames.Count;
+                FrameTime leftFrameTime = leftValid ? leftFrames[i] : zeroFrameTime;
+                FrameTime rightFrameTime = rightValid ? rightFrames[i] : zeroFrameTime;
+
+                float leftBarValue = showCount ? leftFrameTime.count : leftFrameTime.ms;
+                float rightBarValue = showCount ? rightFrameTime.count : rightFrameTime.ms;
+
+                float leftBarLength = Math.Min((w * leftBarValue) / barMax, w);
+                float rightBarLength = Math.Min((w * rightBarValue) / barMax, w);
+
+                EditorGUILayout.BeginHorizontal();
+                if (m_2D.DrawStart(w, h, Draw2D.Origin.TopLeft, style))
+                {
+                    if (leftValid || rightValid)
+                    {
+                        m_2D.DrawFilledBox(0, ySpacing, w, h - ySpacing, UIColor.barBackground);
+
+                        m_2D.DrawFilledBox(0, ySpacing, leftBarLength, barHeight, UIColor.left);
+                        m_2D.DrawFilledBox(0, ySpacing + barHeight, rightBarLength, barHeight, UIColor.right);
+                    }
+                    m_2D.DrawEnd();
+
+                    Rect rect = GUILayoutUtility.GetLastRect();
+                    string leftContent = leftValid ? displayUnits.ToTooltipString(leftBarValue, true, leftFrameTime.frameIndex) : "None";
+                    string rightContent = rightValid ? displayUnits.ToTooltipString(rightBarValue, true, rightFrameTime.frameIndex) : "None";
+                    GUI.Label(rect, new GUIContent("", string.Format("Left:\t{0}\nRight:\t{1}", leftContent, rightContent)));
+                }
+
+                EditorGUILayout.LabelField(leftValid ? displayUnits.ToGUIContentWithTooltips(leftBarValue, frameIndex: leftFrameTime.frameIndex) : Styles.emptyString, GUILayout.Width(LayoutSize.WidthColumn1));
+                EditorGUILayout.LabelField(rightValid ? displayUnits.ToGUIContentWithTooltips(rightBarValue, frameIndex: rightFrameTime.frameIndex) : Styles.emptyString, GUILayout.Width(LayoutSize.WidthColumn2));
+                if (leftValid || rightValid)
+                    EditorGUILayout.LabelField(displayUnits.ToGUIContentWithTooltips(rightBarValue - leftBarValue), GUILayout.Width(LayoutSize.WidthColumn3));
+                EditorGUILayout.EndHorizontal();
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void DrawSelectedStats(MarkerData marker, ProfileDataView markerContext)
+        {
+            GUIStyle style = GUI.skin.label;
+
+            m_Columns.Draw3("", GetDisplayUnits(), "Frame");
+            Draw3LabelMsFrame(Styles.max, marker.msMax, marker.maxFrameIndex, markerContext);
+            Draw2LabelMs(Styles.upperQuartile, marker.msUpperQuartile);
+            Draw3LabelMsFrame(Styles.median, marker.msMedian, marker.medianFrameIndex, markerContext);
+            Draw2LabelMs(Styles.mean, marker.msMean);
+            Draw2LabelMs(Styles.lowerQuartile, marker.msLowerQuartile);
+            Draw3LabelMsFrame(Styles.min, marker.msMin, marker.minFrameIndex, markerContext);
+
+            GUILayout.Space(style.lineHeight);
+
+            Draw3LabelMsFrame(Styles.individualMax, marker.msMaxIndividual,
+                marker.maxIndividualFrameIndex, markerContext);
+            Draw3LabelMsFrame(Styles.individualMin, marker.msMinIndividual,
+                marker.minIndividualFrameIndex, markerContext);
+        }
+
+        void DrawSelected()
+        {
+            EditorGUILayout.BeginVertical(GUI.skin.box, GUILayout.Width(LayoutSize.WidthRHS));
+
+            bool lastMarkerSummary = m_ShowMarkerSummary;
+            m_ShowMarkerSummary = BoldFoldout(m_ShowMarkerSummary, Styles.markerSummary);
+            var analytic = ProfileAnalyzerAnalytics.BeginAnalytic();
+            if (m_ShowMarkerSummary)
+            {
+                if (IsAnalysisValid())
+                {
+                    List<MarkerData> markers = m_ProfileSingleView.analysis.GetMarkers();
+                    if (markers != null)
+                    {
+                        int markerAt = m_SelectedMarker.id;
+                        if (markerAt >= 0 && markerAt < markers.Count)
+                        {
+                            var marker = markers[markerAt];
+
+                            m_MarkerSummaryScroll = GUILayout.BeginScrollView(m_MarkerSummaryScroll, GUIStyle.none, GUI.skin.verticalScrollbar);
+                            Rect clipRect = new Rect(m_MarkerSummaryScroll.x, m_MarkerSummaryScroll.y, LayoutSize.WidthRHS, 500);
+                            m_2D.SetClipRect(clipRect);
+
+                            EditorGUILayout.BeginVertical();
+
+                            EditorGUILayout.LabelField(marker.name,
+                                GUILayout.MaxWidth(LayoutSize.WidthRHS -
+                                    (GUI.skin.box.padding.horizontal + GUI.skin.box.margin.horizontal)));
+
+                            DrawFrameRatio(marker);
+
+                            m_Columns.SetColumnSizes(LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3);
+
+                            EditorGUILayout.BeginHorizontal();
+                            m_Columns.Draw(0, Styles.firstFrame);
+                            m_Columns.Draw(1, Styles.emptyString);
+                            DrawFrameIndexButton(marker.firstFrameIndex, m_ProfileSingleView);
+                            EditorGUILayout.EndHorizontal();
+
+                            GUIStyle style = GUI.skin.label;
+
+                            float min = marker.msMin;
+                            float max = marker.msMax;
+                            string fieldString = "marker time";
+                            Units units = m_DisplayUnits.Units;
+                            if (DisplayCount())
+                            {
+                                min = marker.countMin;
+                                max = marker.countMax;
+                                fieldString = "count";
+                                units = Units.Count;
+                            }
+
+                            TopMarkerList topMarkerList = new TopMarkerList(m_2D, units,
+                                LayoutSize.WidthColumn0, LayoutSize.WidthColumn1, LayoutSize.WidthColumn2, LayoutSize.WidthColumn3,
+                                UIColor.bar, UIColor.barBackground, DrawFrameIndexButton);
+                            m_TopNumber = topMarkerList.Draw(marker, m_ProfileSingleView, m_TopNumber, m_TopStrings, m_TopValues);
+
+                            GUILayout.Space(style.lineHeight);
+
+                            float plotWidth = 40 + GUI.skin.box.padding.horizontal;
+                            float plotHeight = 100;
+
+                            EditorGUILayout.BeginHorizontal();
+
+                            Histogram histogram = new Histogram(m_2D, units);
+                            DrawHistogramForMarker(histogram, marker);
+
+                            BoxAndWhiskerPlot boxAndWhiskerPlot = new BoxAndWhiskerPlot(m_2D, units);
+                            DrawBoxAndWhiskerPlotForMarker(boxAndWhiskerPlot, plotWidth, plotHeight, m_ProfileSingleView.analysis, marker,
+                                min, max, UIColor.standardLine, UIColor.boxAndWhiskerBoxColor);
+
+                            boxAndWhiskerPlot.DrawText(m_Columns.GetColumnWidth(3), plotHeight, min, max,
+                                string.Format("Min {0} for selected frames", fieldString),
+                                string.Format("Max {0} for selected frames", fieldString));
+                            EditorGUILayout.EndHorizontal();
+
+                            GUILayout.Space(style.lineHeight);
+
+                            DrawSelectedStats(marker, m_ProfileSingleView);
+
+                            EditorGUILayout.EndVertical();
+
+                            m_2D.ClearClipRect();
+                            GUILayout.EndScrollView();
+                        }
+                        else
+                        {
+                            EditorGUILayout.LabelField("Marker not in selection");
+                        }
+                    }
+                }
+                else
+                {
+                    EditorGUILayout.LabelField("No marker data selected");
+                }
+            }
+
+            if (m_ShowMarkerSummary != lastMarkerSummary)
+            {
+                ProfileAnalyzerAnalytics.SendUIVisibilityEvent(ProfileAnalyzerAnalytics.UIVisibility.Markers, analytic.GetDurationInSeconds(), m_ShowMarkerSummary);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        internal static bool FileInTempDir(string filePath)
+        {
+            return Directory.Exists(TmpDir) && Directory.GetFiles(TmpDir).Contains(filePath);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerWindow.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerWindow.cs.meta
new file mode 100644
index 0000000..f62047b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileAnalyzerWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0dc59854f72ef4a1fb6dbb8d0cd6aea3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileData.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileData.cs
new file mode 100644
index 0000000..1bc6945
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileData.cs
@@ -0,0 +1,761 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditorInternal;
+using System.IO;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Text.RegularExpressions;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class ProfileData
+    {
+        static int latestVersion = 7;
+        /*
+        Version 1 - Initial version. Thread names index:threadName (Some invalid thread names count:threadName index)
+        Version 2 - Added frame start time.
+        Version 3 - Saved out marker children times in the data (Never needed so rapidly skipped)
+        Version 4 - Removed the child times again (at this point data was saved with 1 less frame at start and end)
+        Version 5 - Updated the thread names to include the thread group as a prefix (index:threadGroup.threadName, index is 1 based, original is 0 based)
+        Version 6 - fixed msStartTime (previously was 'seconds')
+        Version 7 - Data now only skips the frame at the end
+        */
+        static Regex trailingDigit = new Regex(@"^(.*[^\s])[\s]+([\d]+)$", RegexOptions.Compiled);
+        public int Version { get; private set; }
+        public int FrameIndexOffset { get; private set; }
+        public bool FirstFrameIncomplete;
+        public bool LastFrameIncomplete;
+        List<ProfileFrame> frames = new List<ProfileFrame>();
+        List<string> markerNames = new List<string>();
+        List<string> threadNames = new List<string>();
+        Dictionary<string, int> markerNamesDict = new Dictionary<string, int>();
+        Dictionary<string, int> threadNameDict = new Dictionary<string, int>();
+        public string FilePath { get; private set; }
+        public int MarkerNameCount => markerNames.Count;
+        static float s_Progress = 0;
+
+        public ProfileData()
+        {
+            FrameIndexOffset = 0;
+            FilePath = string.Empty;
+            Version = latestVersion;
+        }
+
+        public ProfileData(string filename)
+        {
+            FrameIndexOffset = 0;
+            FilePath = filename;
+            Version = latestVersion;
+        }
+
+        void Read()
+        {
+            if (string.IsNullOrEmpty(FilePath))
+                throw new Exception("File path is invalid");
+
+            using (var reader = new BinaryReader(File.Open(FilePath, FileMode.Open)))
+            {
+                s_Progress = 0;
+                Version = reader.ReadInt32();
+                if (Version < 0 || Version > latestVersion)
+                {
+                    throw new Exception(String.Format("File version unsupported: {0} != {1} expected, at path: {2}", Version, latestVersion, FilePath));
+                }
+
+                FrameIndexOffset = reader.ReadInt32();
+                int frameCount = reader.ReadInt32();
+                frames.Clear();
+                for (int frame = 0; frame < frameCount; frame++)
+                {
+                    frames.Add(new ProfileFrame(reader, Version));
+                    s_Progress = (float)frame / frameCount;
+                }
+
+                int markerCount = reader.ReadInt32();
+                markerNames.Clear();
+                for (int marker = 0; marker < markerCount; marker++)
+                {
+                    markerNames.Add(reader.ReadString());
+                    s_Progress = (float)marker / markerCount;
+                }
+
+                int threadCount = reader.ReadInt32();
+                threadNames.Clear();
+                for (int thread = 0; thread < threadCount; thread++)
+                {
+                    var threadNameWithIndex = reader.ReadString();
+
+                    threadNameWithIndex = CorrectThreadName(threadNameWithIndex);
+
+                    threadNames.Add(threadNameWithIndex);
+                    s_Progress = (float)thread / threadCount;
+                }
+            }
+        }
+
+        internal void DeleteTmpFiles()
+        {
+            if (ProfileAnalyzerWindow.FileInTempDir(FilePath))
+                File.Delete(FilePath);
+        }
+
+        bool IsFrameSame(int frameIndex, ProfileData other)
+        {
+            ProfileFrame thisFrame = GetFrame(frameIndex);
+            ProfileFrame otherFrame = other.GetFrame(frameIndex);
+            return thisFrame.IsSame(otherFrame);
+        }
+
+        public bool IsSame(ProfileData other)
+        {
+            if (other == null)
+                return false;
+
+            int frameCount = GetFrameCount();
+            if (frameCount != other.GetFrameCount())
+            {
+                // Frame counts differ
+                return false;
+            }
+
+            if (frameCount == 0)
+            {
+                // Both empty
+                return true;
+            }
+
+            if (!IsFrameSame(0, other))
+                return false;
+            if (!IsFrameSame(frameCount - 1, other))
+                return false;
+
+            // Close enough if same number of frames and first/last have exactly the same frame time and time offset.
+            // If we see false matches we could add a full has of the data on load/pull
+            return true;
+        }
+
+        static public string ThreadNameWithIndex(int index, string threadName)
+        {
+            return string.Format("{0}:{1}", index, threadName);
+        }
+
+        public void SetFrameIndexOffset(int offset)
+        {
+            FrameIndexOffset = offset;
+        }
+
+        public int GetFrameCount()
+        {
+            return frames.Count;
+        }
+
+        public ProfileFrame GetFrame(int offset)
+        {
+            if (offset < 0 || offset >= frames.Count)
+                return null;
+
+            return frames[offset];
+        }
+
+        public List<string> GetMarkerNames()
+        {
+            return markerNames;
+        }
+
+        public List<string> GetThreadNames()
+        {
+            return threadNames;
+        }
+
+        public int GetThreadCount()
+        {
+            return threadNames.Count;
+        }
+
+        public int OffsetToDisplayFrame(int offset)
+        {
+            return offset + (1 + FrameIndexOffset);
+        }
+
+        public int DisplayFrameToOffset(int displayFrame)
+        {
+            return displayFrame - (1 + FrameIndexOffset);
+        }
+
+        public void AddThreadName(string threadName, ProfileThread thread)
+        {
+            threadName = CorrectThreadName(threadName);
+
+            int index = -1;
+
+            if (!threadNameDict.TryGetValue(threadName, out index))
+            {
+                threadNames.Add(threadName);
+                index = threadNames.Count - 1;
+
+                threadNameDict.Add(threadName, index);
+            }
+
+            thread.threadIndex = index;
+        }
+
+        public void AddMarkerName(string markerName, ProfileMarker marker)
+        {
+            int index = -1;
+            if (!markerNamesDict.TryGetValue(markerName, out index))
+            {
+                markerNames.Add(markerName);
+                index = markerNames.Count - 1;
+
+                markerNamesDict.Add(markerName, index);
+            }
+
+            marker.nameIndex = index;
+        }
+
+        public string GetThreadName(ProfileThread thread)
+        {
+            return threadNames[thread.threadIndex];
+        }
+
+        public string GetMarkerName(ProfileMarker marker)
+        {
+            return markerNames[marker.nameIndex];
+        }
+
+        public int GetMarkerIndex(string markerName)
+        {
+            for (int nameIndex = 0; nameIndex < markerNames.Count; ++nameIndex)
+            {
+                if (markerName == markerNames[nameIndex])
+                    return nameIndex;
+            }
+            return -1;
+        }
+
+        public void Add(ProfileFrame frame)
+        {
+            frames.Add(frame);
+        }
+
+        void WriteInternal(string filepath)
+        {
+            using (var writer = new BinaryWriter(File.Open(filepath, FileMode.OpenOrCreate)))
+            {
+                Version = latestVersion;
+
+                writer.Write(Version);
+                writer.Write(FrameIndexOffset);
+
+                writer.Write(frames.Count);
+                foreach (var frame in frames)
+                {
+                    frame.Write(writer);
+                }
+
+                writer.Write(markerNames.Count);
+                foreach (var markerName in markerNames)
+                {
+                    writer.Write(markerName);
+                }
+
+                writer.Write(threadNames.Count);
+                foreach (var threadName in threadNames)
+                {
+                    writer.Write(threadName);
+                }
+            }
+        }
+
+        internal void Write()
+        {
+            //ensure that we can always write to the temp location at least
+            if (string.IsNullOrEmpty(FilePath))
+                FilePath = ProfileAnalyzerWindow.TmpPath;
+
+            WriteInternal(FilePath);
+        }
+
+        internal void WriteTo(string path)
+        {
+            //no point in trying to save on top of ourselves
+            if (path == FilePath)
+                return;
+
+            if (!string.IsNullOrEmpty(FilePath) && File.Exists(FilePath))
+            {
+                if (File.Exists(path))
+                    File.Delete(path);
+
+                File.Copy(FilePath, path);
+            }
+            else
+            {
+                WriteInternal(path);
+            }
+            FilePath = path;
+        }
+
+        public static string CorrectThreadName(string threadNameWithIndex)
+        {
+            var info = threadNameWithIndex.Split(':');
+            if (info.Length >= 2)
+            {
+                string threadGroupIndexString = info[0];
+                string threadName = info[1];
+                if (threadName.Trim() == "")
+                {
+                    // Scan seen with no thread name
+                    threadNameWithIndex = string.Format("{0}:[Unknown]", threadGroupIndexString);
+                }
+                else
+                {
+                    // Some scans have thread names such as
+                    // "1:Worker Thread 0"
+                    // "1:Worker Thread 1"
+                    // rather than
+                    // "1:Worker Thread"
+                    // "2:Worker Thread"
+                    // Update to the second format so the 'All' case is correctly determined
+                    Match m = trailingDigit.Match(threadName);
+                    if (m.Success)
+                    {
+                        string threadNamePrefix = m.Groups[1].Value;
+                        int threadGroupIndex = 1 + int.Parse(m.Groups[2].Value);
+
+                        threadNameWithIndex = string.Format("{0}:{1}", threadGroupIndex, threadNamePrefix);
+                    }
+                }
+            }
+
+            threadNameWithIndex = threadNameWithIndex.Trim();
+
+            return threadNameWithIndex;
+        }
+
+        public static string GetThreadNameWithGroup(string threadName, string groupName)
+        {
+            if (string.IsNullOrEmpty(groupName))
+                return threadName;
+
+            return string.Format("{0}.{1}", groupName, threadName);
+        }
+
+        public static string GetThreadNameWithoutGroup(string threadNameWithGroup, out string groupName)
+        {
+            string[] tokens = threadNameWithGroup.Split('.');
+            if (tokens.Length <= 1)
+            {
+                groupName = "";
+                return tokens[0];
+            }
+
+            groupName = tokens[0];
+            return tokens[1].TrimStart();
+        }
+
+        internal bool HasFrames
+        {
+            get
+            {
+                return frames != null && frames.Count > 0;
+            }
+        }
+
+        internal bool HasThreads
+        {
+            get
+            {
+                return frames[0].threads != null && frames[0].threads.Count > 0;
+            }
+        }
+
+        internal bool NeedsMarkerRebuild
+        {
+            get
+            {
+                if (frames.Count > 0 && frames[0].threads.Count > 0)
+                    return frames[0].threads[0].markers.Count != frames[0].threads[0].markerCount;
+
+                return false;
+            }
+        }
+
+        public static bool Save(string filename, ProfileData data)
+        {
+            if (data == null)
+                return false;
+
+            if (string.IsNullOrEmpty(filename))
+                return false;
+
+            if (filename.EndsWith(".json"))
+            {
+                var json = JsonUtility.ToJson(data);
+                File.WriteAllText(filename, json);
+            }
+            else if (filename.EndsWith(".padata"))
+            {
+                FileStream stream = File.Create(filename);
+                var formatter = new BinaryFormatter();
+                formatter.Serialize(stream, data);
+                stream.Close();
+            }
+            else if (filename.EndsWith(".pdata"))
+            {
+                data.WriteTo(filename);
+            }
+
+            return true;
+        }
+
+        public static bool Load(string filename, out ProfileData data)
+        {
+            if (filename.EndsWith(".json"))
+            {
+                string json = File.ReadAllText(filename);
+                data = JsonUtility.FromJson<ProfileData>(json);
+            }
+            else if (filename.EndsWith(".padata"))
+            {
+                FileStream stream = File.OpenRead(filename);
+                var formatter = new BinaryFormatter();
+                data = (ProfileData)formatter.Deserialize(stream);
+                stream.Close();
+
+                if (data.Version != latestVersion)
+                {
+                    Debug.Log(String.Format("Unable to load file. Incorrect file version in {0} : (file {1} != {2} expected", filename, data.Version, latestVersion));
+                    data = null;
+                    return false;
+                }
+            }
+            else if (filename.EndsWith(".pdata"))
+            {
+                if (!File.Exists(filename))
+                {
+                    data = null;
+                    return false;
+                }
+
+                try
+                {
+                    data = new ProfileData(filename);
+                    data.Read();
+                }
+                catch (Exception e)
+                {
+                    var message = e.Message;
+                    if (!string.IsNullOrEmpty(message))
+                        Debug.Log(e.Message);
+                    data = null;
+                    return false;
+                }
+            }
+            else
+            {
+                string errorMessage;
+                if (filename.EndsWith(".data"))
+                {
+                    errorMessage = "Unable to load file. Profiler captures (.data) should be loaded in the Profiler Window and then pulled into the Analyzer via its Pull Data button.";
+                }
+                else
+                {
+                    errorMessage = string.Format("Unable to load file. Unsupported file format: '{0}'.", Path.GetExtension(filename));
+                }
+
+                Debug.Log(errorMessage);
+                data = null;
+                return false;
+            }
+
+            data.Finalise();
+            return true;
+        }
+
+        void PushMarker(Stack<ProfileMarker> markerStack, ProfileMarker markerData)
+        {
+            Debug.Assert(markerData.depth == markerStack.Count + 1);
+            markerStack.Push(markerData);
+        }
+
+        ProfileMarker PopMarkerAndRecordTimeInParent(Stack<ProfileMarker> markerStack)
+        {
+            ProfileMarker child = markerStack.Pop();
+
+            ProfileMarker parentMarker = (markerStack.Count > 0) ? markerStack.Peek() : null;
+
+            // Record the last markers time in its parent
+            if (parentMarker != null)
+                parentMarker.msChildren += child.msMarkerTotal;
+
+            return parentMarker;
+        }
+
+        public void Finalise()
+        {
+            CalculateMarkerChildTimes();
+            markerNamesDict.Clear();
+        }
+
+        void CalculateMarkerChildTimes()
+        {
+            var markerStack = new Stack<ProfileMarker>();
+
+            for (int frameOffset = 0; frameOffset <= frames.Count; ++frameOffset)
+            {
+                var frameData = GetFrame(frameOffset);
+                if (frameData == null)
+                    continue;
+
+                for (int threadIndex = 0; threadIndex < frameData.threads.Count; threadIndex++)
+                {
+                    var threadData = frameData.threads[threadIndex];
+
+                    // The markers are in depth first order and the depth is known
+                    // So we can infer a parent child relationship
+                    // Zero them first
+                    foreach (ProfileMarker markerData in threadData.markers)
+                    {
+                        markerData.msChildren = 0.0f;
+                    }
+
+                    // Update the child times
+                    markerStack.Clear();
+                    foreach (ProfileMarker markerData in threadData.markers)
+                    {
+                        int depth = markerData.depth;
+
+                        // Update depth stack and record child times in the parent
+                        if (depth >= markerStack.Count)
+                        {
+                            // If at same level then remove the last item at this level
+                            if (depth == markerStack.Count)
+                            {
+                                PopMarkerAndRecordTimeInParent(markerStack);
+                            }
+
+                            // Assume we can't move down depth without markers between levels.
+                        }
+                        else if (depth < markerStack.Count)
+                        {
+                            // We can move up depth several layers so need to pop off all those markers
+                            while (markerStack.Count >= depth)
+                            {
+                                PopMarkerAndRecordTimeInParent(markerStack);
+                            }
+                        }
+
+                        PushMarker(markerStack, markerData);
+                    }
+                }
+            }
+        }
+
+        public static float GetLoadingProgress()
+        {
+            return s_Progress;
+        }
+    }
+
+    [Serializable]
+    internal class ProfileFrame
+    {
+        public List<ProfileThread> threads = new List<ProfileThread>();
+        public double msStartTime;
+        public float msFrame;
+
+        public ProfileFrame()
+        {
+            msStartTime = 0.0;
+            msFrame = 0f;
+        }
+
+        public bool IsSame(ProfileFrame otherFrame)
+        {
+            if (msStartTime != otherFrame.msStartTime)
+                return false;
+            if (msFrame != otherFrame.msFrame)
+                return false;
+            if (threads.Count != otherFrame.threads.Count)
+                return false;
+
+            // Close enough.
+            return true;
+        }
+
+        public void Add(ProfileThread thread)
+        {
+            threads.Add(thread);
+        }
+
+        public void Write(BinaryWriter writer)
+        {
+            writer.Write(msStartTime);
+            writer.Write(msFrame);
+            writer.Write(threads.Count);
+            foreach (var thread in threads)
+            {
+                thread.Write(writer);
+            }
+            ;
+        }
+
+        public ProfileFrame(BinaryReader reader, int fileVersion)
+        {
+            if (fileVersion > 1)
+            {
+                if (fileVersion >= 6)
+                {
+                    msStartTime = reader.ReadDouble();
+                }
+                else
+                {
+                    double sStartTime = reader.ReadDouble();
+                    msStartTime = sStartTime * 1000.0;
+                }
+            }
+
+            msFrame = reader.ReadSingle();
+            int threadCount = reader.ReadInt32();
+            threads.Clear();
+            for (int thread = 0; thread < threadCount; thread++)
+            {
+                threads.Add(new ProfileThread(reader, fileVersion));
+            }
+        }
+    }
+
+    [Serializable]
+    internal class ProfileThread
+    {
+        [NonSerialized]
+        public List<ProfileMarker> markers = new List<ProfileMarker>();
+        public int threadIndex;
+        public long streamPos;
+        public int markerCount = 0;
+        public int fileVersion;
+
+        public ProfileThread()
+        {
+        }
+
+        public void Write(BinaryWriter writer)
+        {
+            writer.Write(threadIndex);
+            writer.Write(markers.Count);
+            foreach (var marker in markers)
+            {
+                marker.Write(writer);
+            }
+            ;
+        }
+
+        public ProfileThread(BinaryReader reader, int fileversion)
+        {
+            streamPos = reader.BaseStream.Position;
+            fileVersion = fileversion;
+            threadIndex = reader.ReadInt32();
+            markerCount = reader.ReadInt32();
+            markers.Clear();
+            for (int marker = 0; marker < markerCount; marker++)
+            {
+                markers.Add(new ProfileMarker(reader, fileVersion));
+            }
+        }
+
+        public bool ReadMarkers(string path)
+        {
+            if (streamPos == 0)
+                return false; // the stream positions havent been written yet.
+            var stream = File.OpenRead(path);
+            BinaryReader br = new BinaryReader(stream);
+
+            br.BaseStream.Position = streamPos;
+            threadIndex = br.ReadInt32();
+            markerCount = br.ReadInt32();
+
+            markers.Clear();
+            for (int marker = 0; marker < markerCount; marker++)
+            {
+                markers.Add(new ProfileMarker(br, fileVersion));
+            }
+
+            br.Close();
+            return true;
+        }
+
+        public void AddMarker(ProfileMarker markerData)
+        {
+            markers.Add(markerData);
+            markerCount++;
+        }
+
+        public void RebuildMarkers(string path)
+        {
+            if (!File.Exists(path)) return;
+            FileStream stream = File.OpenRead(path);
+            using (var reader = new BinaryReader(stream))
+            {
+                reader.BaseStream.Position = streamPos;
+                threadIndex = reader.ReadInt32();
+                markerCount = reader.ReadInt32();
+                markers.Clear();
+                for (int marker = 0; marker < markerCount; marker++)
+                {
+                    markers.Add(new ProfileMarker(reader, fileVersion));
+                }
+            }
+        }
+    }
+
+    [Serializable]
+    internal class ProfileMarker
+    {
+        public int nameIndex;
+        public float msMarkerTotal;
+        public int depth;
+        [NonSerialized]
+        public float msChildren;        // Recalculated on load so not saved in file
+
+        public ProfileMarker()
+        {
+        }
+
+        public static ProfileMarker Create(float durationMS, int depth)
+        {
+            var item = new ProfileMarker
+            {
+                msMarkerTotal = durationMS,
+                depth = depth,
+                msChildren = 0.0f
+            };
+
+            return item;
+        }
+
+        public static ProfileMarker Create(ProfilerFrameDataIterator frameData)
+        {
+            return Create(frameData.durationMS, frameData.depth);
+        }
+
+        public void Write(BinaryWriter writer)
+        {
+            writer.Write(nameIndex);
+            writer.Write(msMarkerTotal);
+            writer.Write(depth);
+        }
+
+        public ProfileMarker(BinaryReader reader, int fileVersion)
+        {
+            nameIndex = reader.ReadInt32();
+            msMarkerTotal = reader.ReadSingle();
+            depth = reader.ReadInt32();
+            if (fileVersion == 3)   // In this version we saved the msChildren value but we don't need to as we now recalculate on load
+                msChildren = reader.ReadSingle();
+            else
+                msChildren = 0.0f;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileData.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileData.cs.meta
new file mode 100644
index 0000000..7051bdf
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5cea2082789f54c25b65fd1fef416863
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileDataView.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileDataView.cs
new file mode 100644
index 0000000..8b44b58
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileDataView.cs
@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class ProfileDataView
+    {
+        public string path;
+        public ProfileData data;
+        public ProfileAnalysis analysisFullNew;
+        public ProfileAnalysis analysisFull;
+        public ProfileAnalysis analysisNew;
+        public ProfileAnalysis analysis;
+        public List<int> selectedIndices = new List<int> { 0, 0 };
+        [NonSerialized]
+        public bool inSyncWithProfilerData;
+        public bool containsWaitForFPS { get; private set; }
+        public bool containsWaitForPresent { get; private set; }
+
+        public ProfileDataView()
+        {
+        }
+
+        public ProfileDataView(ProfileDataView dataView)
+        {
+            path = dataView.path;
+            data = dataView.data;
+            analysisFullNew = dataView.analysisFullNew;
+            analysisFull = dataView.analysisFull;
+            analysisNew = dataView.analysisNew;
+            analysis = dataView.analysis;
+            selectedIndices = new List<int>(dataView.selectedIndices);
+            inSyncWithProfilerData = dataView.inSyncWithProfilerData;
+            containsWaitForFPS = dataView.containsWaitForFPS;
+            containsWaitForPresent = dataView.containsWaitForPresent;
+        }
+
+        public void FindKeyMarkers()
+        {
+            containsWaitForFPS = data.GetMarkerIndex("WaitForTargetFPS") != -1;
+            containsWaitForPresent = data.GetMarkerIndex("Gfx.WaitForPresentOnGfxThread") != -1;
+        }
+
+        public bool IsDataValid()
+        {
+            if (data == null)
+                return false;
+
+            if (data.GetFrameCount() == 0)
+                return false;
+
+            if (data.NeedsMarkerRebuild)
+            {
+                if (!ProfileData.Load(data.FilePath, out data))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public bool HasValidSelection()
+        {
+            if (selectedIndices.Count == 2 && selectedIndices[0] == 0 && selectedIndices[1] == 0)
+                return false;
+
+            return true;
+        }
+
+        public bool HasSelection()
+        {
+            if (selectedIndices.Count == 0)
+                return false;
+            if (selectedIndices.Count == data.GetFrameCount())
+                return false;
+
+            return HasValidSelection();
+        }
+
+        public bool AllSelected()
+        {
+            if (selectedIndices.Count != data.GetFrameCount())
+                return false;
+
+            return true;
+        }
+
+        public int GetMaxDepth()
+        {
+            return (analysis == null) ? 1 : analysis.GetFrameSummary().maxMarkerDepth;
+        }
+
+        int Clamp(int value, int min, int max)
+        {
+            if (value < min)
+                value = min;
+            else if (value > max)
+                value = max;
+
+            return value;
+        }
+
+        public int ClampToValidDepthValue(int depthFilter)
+        {
+            // ProfileAnalyzer.kDepthAll is special case that we don't test for here
+
+            // If we have no depth values then return -1 for all (as clamp expects min<max)
+            int maxDepth = GetMaxDepth();
+            if (maxDepth < 1)
+                return ProfileAnalyzer.kDepthAll;
+
+            return Clamp(depthFilter, 1, maxDepth);
+        }
+
+        bool SelectAllFramesContainingMarker(string markerName, ProfileAnalysis inAnalysis)
+        {
+            if (inAnalysis == null)
+                return false;
+
+            selectedIndices.Clear();
+
+            MarkerData markerData = inAnalysis.GetMarkerByName(markerName);
+            if (markerData == null)
+                return true;
+
+            foreach (var frameTime in markerData.frames)
+            {
+                selectedIndices.Add(frameTime.frameIndex);
+            }
+
+            // Order from lowest to highest so the start/end frame display makes sense
+            selectedIndices.Sort();
+
+            return true;
+        }
+
+        public bool SelectAllFramesContainingMarker(string markerName, bool inSelection)
+        {
+            return SelectAllFramesContainingMarker(markerName, inSelection ? analysis : analysisFull);
+        }
+
+        int ClampToRange(int value, int min, int max)
+        {
+            if (value < min)
+                value = min;
+            if (value > max)
+                value = max;
+
+            return value;
+        }
+
+        public void ClearSelection()
+        {
+            selectedIndices.Clear();
+        }
+
+        public void SelectFullRange()
+        {
+            selectedIndices.Clear();
+
+            if (data == null)
+                return;
+
+            for (int offset = 0; offset < data.GetFrameCount(); offset++)
+            {
+                selectedIndices.Add(data.OffsetToDisplayFrame(offset));
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileDataView.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileDataView.cs.meta
new file mode 100644
index 0000000..17c3d14
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileDataView.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 59e8a7346ec034a4387b6ca1ab20b83e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileTable.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileTable.cs
new file mode 100644
index 0000000..6cbb7a6
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileTable.cs
@@ -0,0 +1,939 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine;
+using UnityEngine.Assertions;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    class ProfileTreeViewItem : TreeViewItem
+    {
+        public MarkerData data { get; set; }
+        public GUIContent[] cachedRowString;
+
+        public ProfileTreeViewItem(int id, int depth, string displayName, MarkerData data) : base(id, depth, displayName)
+        {
+            this.data = data;
+            cachedRowString = null;
+        }
+    }
+
+    class ProfileTable : TreeView
+    {
+        Draw2D m_2D;
+        ProfileDataView m_DataView;
+        bool m_HideRemovedMarkers;
+        ProfileAnalyzerWindow m_ProfileAnalyzerWindow;
+        Color m_BarColor;
+        float m_MaxMedian;
+        int m_MaxCount;
+        float m_MaxCountMean;
+        double m_MaxTotal;
+
+        const float kRowHeights = 20f;
+        readonly List<TreeViewItem> m_Rows = new List<TreeViewItem>(100);
+
+        // All columns
+        public enum MyColumns
+        {
+            Name,
+            State,
+            Depth,
+            Median,
+            MedianBar,
+            Mean,
+            StandardDeviation,
+            Min,
+            Max,
+            Range,
+            Count,
+            CountBar,
+            CountMean,
+            CountMeanBar,
+            CountStandardDeviation,
+            FirstFrame,
+            AtMedian,
+            Total,
+            TotalBar,
+            Threads,
+        }
+
+        static int m_MaxColumns;
+
+        public enum SortOption
+        {
+            Name,
+            State,
+            Depth,
+            Median,
+            Mean,
+            Min,
+            Max,
+            StandardDeviation,
+            Range,
+            Count,
+            CountMean,
+            CountStandardDeviation,
+            FirstFrame,
+            AtMedian,
+            Total,
+            Threads,
+        }
+
+        // Sort options per column
+        SortOption[] m_SortOptions =
+        {
+            SortOption.Name,
+            SortOption.State,
+            SortOption.Depth,
+            SortOption.Median,
+            SortOption.Median,
+            SortOption.Mean,
+            SortOption.StandardDeviation,
+            SortOption.Min,
+            SortOption.Max,
+            SortOption.Range,
+            SortOption.Count,
+            SortOption.Count,
+            SortOption.CountMean,
+            SortOption.CountMean,
+            SortOption.CountStandardDeviation,
+            SortOption.FirstFrame,
+            SortOption.AtMedian,
+            SortOption.Total,
+            SortOption.Total,
+            SortOption.Threads,
+        };
+
+        internal static class Styles
+        {
+            public static readonly GUIContent menuItemSelectFramesInAll = new GUIContent("Select Frames that contain this marker (within whole data set)", "");
+            public static readonly GUIContent menuItemSelectFramesInCurrent = new GUIContent("Select Frames that contain this marker (within current selection)", "");
+            //public static readonly GUIContent menuItemClearSelection = new GUIContent("Clear Selection");
+            public static readonly GUIContent menuItemSelectFramesAll = new GUIContent("Select All");
+            public static readonly GUIContent menuItemAddToIncludeFilter = new GUIContent("Add to Include Filter", "");
+            public static readonly GUIContent menuItemAddToExcludeFilter = new GUIContent("Add to Exclude Filter", "");
+            public static readonly GUIContent menuItemRemoveFromIncludeFilter = new GUIContent("Remove from Include Filter", "");
+            public static readonly GUIContent menuItemRemoveFromExcludeFilter = new GUIContent("Remove from Exclude Filter", "");
+            public static readonly GUIContent menuItemSetAsParentMarkerFilter = new GUIContent("Set as Parent Marker Filter", "");
+            public static readonly GUIContent menuItemClearParentMarkerFilter = new GUIContent("Clear Parent Marker Filter", "");
+            public static readonly GUIContent menuItemSetAsRemoveMarker = new GUIContent("Remove Marker", "");
+            public static readonly GUIContent menuItemCopyToClipboard = new GUIContent("Copy to Clipboard", "");
+        }
+
+        public ProfileTable(TreeViewState state, MultiColumnHeader multicolumnHeader, ProfileDataView dataView, bool hideRemovedMarkers, ProfileAnalyzerWindow profileAnalyzerWindow, Draw2D draw2D, Color barColor) : base(state, multicolumnHeader)
+        {
+            m_2D = draw2D;
+            m_DataView = dataView;
+            m_HideRemovedMarkers = hideRemovedMarkers;
+            m_ProfileAnalyzerWindow = profileAnalyzerWindow;
+            m_BarColor = barColor;
+
+            m_MaxColumns = Enum.GetValues(typeof(MyColumns)).Length;
+            Assert.AreEqual(m_SortOptions.Length, m_MaxColumns, "Ensure number of sort options are in sync with number of MyColumns enum values");
+
+            // Custom setup
+            rowHeight = kRowHeights;
+            showAlternatingRowBackgrounds = true;
+            showBorder = true;
+            customFoldoutYOffset = (kRowHeights - EditorGUIUtility.singleLineHeight) * 0.5f; // center foldout in the row since we also center content. See RowGUI
+            // extraSpaceBeforeIconAndLabel = 0;
+            multicolumnHeader.sortingChanged += OnSortingChanged;
+            multicolumnHeader.visibleColumnsChanged += OnVisibleColumnsChanged;
+
+            Reload();
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            int idForhiddenRoot = -1;
+            int depthForHiddenRoot = -1;
+            ProfileTreeViewItem root = new ProfileTreeViewItem(idForhiddenRoot, depthForHiddenRoot, "root", null);
+
+            m_MaxMedian = 0.0f;
+            m_MaxTotal = 0.0;
+            m_MaxCount = 0;
+            m_MaxCountMean = 0.0f;
+            var markers = m_DataView.analysis.GetMarkers();
+            for (int index = 0; index < markers.Count; ++index)
+            {
+                var marker = markers[index];
+                if (!m_ProfileAnalyzerWindow.DoesMarkerPassFilter(marker.name))
+                    continue;
+
+                if (m_HideRemovedMarkers && marker.IsFullyIgnored())
+                    continue;
+
+               var item = new ProfileTreeViewItem(index, 0, marker.name, marker);
+                root.AddChild(item);
+                float ms = item.data.msMedian;
+                if (ms > m_MaxMedian)
+                    m_MaxMedian = ms;
+
+                double msTotal = item.data.msTotal;
+                if (msTotal > m_MaxTotal)
+                    m_MaxTotal = msTotal;
+
+                int count = item.data.count;
+                if (count > m_MaxCount)
+                    m_MaxCount = count;
+
+                float countMean = item.data.countMean;
+                if (countMean > m_MaxCountMean)
+                    m_MaxCountMean = countMean;
+            }
+
+            return root;
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem root)
+        {
+            m_Rows.Clear();
+
+            if (rootItem != null && rootItem.children != null)
+            {
+                foreach (ProfileTreeViewItem node in rootItem.children)
+                {
+                    m_Rows.Add(node);
+                }
+            }
+
+            SortIfNeeded(m_Rows);
+
+            return m_Rows;
+        }
+
+        void OnSortingChanged(MultiColumnHeader _multiColumnHeader)
+        {
+            SortIfNeeded(GetRows());
+        }
+
+        protected virtual void OnVisibleColumnsChanged(MultiColumnHeader multiColumnHeader)
+        {
+            m_ProfileAnalyzerWindow.SetSingleModeColumns(multiColumnHeader.state.visibleColumns);
+            multiColumnHeader.ResizeToFit();
+        }
+
+        void SortIfNeeded(IList<TreeViewItem> rows)
+        {
+            if (rows.Count <= 1)
+            {
+                return;
+            }
+
+            if (multiColumnHeader.sortedColumnIndex == -1)
+            {
+                return; // No column to sort for (just use the order the data are in)
+            }
+
+            // Sort the roots of the existing tree items
+            SortByMultipleColumns();
+
+            // Update the data with the sorted content
+            rows.Clear();
+            foreach (ProfileTreeViewItem node in rootItem.children)
+            {
+                rows.Add(node);
+            }
+
+            Repaint();
+        }
+
+        string GetThreadName(ProfileTreeViewItem item)
+        {
+            return m_ProfileAnalyzerWindow.GetUIThreadName(item.data.threads[0]);
+        }
+
+        string GetThreadNames(ProfileTreeViewItem item)
+        {
+            var uiNames = new List<string>();
+            foreach (string threadNameWithIndex in item.data.threads)
+            {
+                string uiName = m_ProfileAnalyzerWindow.GetUIThreadName(threadNameWithIndex);
+
+                uiNames.Add(uiName);
+            }
+            uiNames.Sort(m_ProfileAnalyzerWindow.CompareUINames);
+
+            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            bool first = true;
+            foreach (var uiName in uiNames)
+            {
+                if (first)
+                    first = false;
+                else
+                    sb.Append(", ");
+                sb.Append(uiName);
+            }
+
+            return sb.ToString();
+        }
+
+        void SortByMultipleColumns()
+        {
+            var sortedColumns = multiColumnHeader.state.sortedColumns;
+
+            if (sortedColumns.Length == 0)
+            {
+                return;
+            }
+
+            var myTypes = rootItem.children.Cast<ProfileTreeViewItem>();
+            var orderedQuery = InitialOrder(myTypes, sortedColumns);
+            for (int i = 1; i < sortedColumns.Length; i++)
+            {
+                SortOption sortOption = m_SortOptions[sortedColumns[i]];
+                bool ascending = multiColumnHeader.IsSortedAscending(sortedColumns[i]);
+
+                switch (sortOption)
+                {
+                    case SortOption.Name:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.name, ascending);
+                        break;
+                    case SortOption.State:
+                        orderedQuery = orderedQuery.ThenBy(l => State(l), ascending);
+                        break;
+                    case SortOption.Depth:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.minDepth, ascending);
+                        break;
+                    case SortOption.Mean:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.msMean, ascending);
+                        break;
+                    case SortOption.Median:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.msMedian, ascending);
+                        break;
+                    case SortOption.StandardDeviation:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.msStandardDeviation, ascending);
+                        break;
+                    case SortOption.Min:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.msMin, ascending);
+                        break;
+                    case SortOption.Max:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.msMax, ascending);
+                        break;
+                    case SortOption.Range:
+                        orderedQuery = orderedQuery.ThenBy(l => (l.data.msMax - l.data.msMin), ascending);
+                        break;
+                    case SortOption.Count:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.count, ascending);
+                        break;
+                    case SortOption.CountMean:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.countMean, ascending);
+                        break;
+                    case SortOption.CountStandardDeviation:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.countStandardDeviation, ascending);
+                        break;
+                    case SortOption.FirstFrame:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.firstFrameIndex, ascending);
+                        break;
+                    case SortOption.AtMedian:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.msAtMedian, ascending);
+                        break;
+                    case SortOption.Total:
+                        orderedQuery = orderedQuery.ThenBy(l => l.data.msTotal, ascending);
+                        break;
+                    case SortOption.Threads:
+                        orderedQuery = orderedQuery.ThenBy(l => l.cachedRowString != null ? l.cachedRowString[(int)MyColumns.Threads].text : GetThreadNames(l), ascending);
+                        break;
+                }
+            }
+
+            rootItem.children = orderedQuery.Cast<TreeViewItem>().ToList();
+        }
+
+        IOrderedEnumerable<ProfileTreeViewItem> InitialOrder(IEnumerable<ProfileTreeViewItem> myTypes, int[] history)
+        {
+            SortOption sortOption = m_SortOptions[history[0]];
+            bool ascending = multiColumnHeader.IsSortedAscending(history[0]);
+            switch (sortOption)
+            {
+                case SortOption.Name:
+                    return myTypes.Order(l => l.data.name, ascending);
+                case SortOption.State:
+                    return myTypes.Order(l => State(l), ascending);
+                case SortOption.Depth:
+                    return myTypes.Order(l => l.data.minDepth, ascending);
+                case SortOption.Mean:
+                    return myTypes.Order(l => l.data.msMean, ascending);
+                case SortOption.Median:
+                    return myTypes.Order(l => l.data.msMedian, ascending);
+                case SortOption.StandardDeviation:
+                    return myTypes.Order(l => l.data.msStandardDeviation, ascending);
+                case SortOption.Min:
+                    return myTypes.Order(l => l.data.msMin, ascending);
+                case SortOption.Max:
+                    return myTypes.Order(l => l.data.msMax, ascending);
+                case SortOption.Range:
+                    return myTypes.Order(l => (l.data.msMax - l.data.msMin), ascending);
+                case SortOption.Count:
+                    return myTypes.Order(l => l.data.count, ascending);
+                case SortOption.CountMean:
+                    return myTypes.Order(l => l.data.countMean, ascending);
+                case SortOption.CountStandardDeviation:
+                    return myTypes.Order(l => l.data.countStandardDeviation, ascending);
+                case SortOption.FirstFrame:
+                    return myTypes.Order(l => l.data.firstFrameIndex, ascending);
+                case SortOption.AtMedian:
+                    return myTypes.Order(l => l.data.msAtMedian, ascending);
+                case SortOption.Total:
+                    return myTypes.Order(l => l.data.msTotal, ascending);
+                case SortOption.Threads:
+                    return myTypes.Order(l => l.cachedRowString != null ? l.cachedRowString[(int)MyColumns.Threads].text : GetThreadNames(l), ascending);
+                default:
+                    Assert.IsTrue(false, "Unhandled enum");
+                    break;
+            }
+
+            // default
+            return myTypes.Order(l => l.data.name, ascending);
+        }
+
+        int State(ProfileTreeViewItem item)
+        {
+            if (item.data.timeRemoved > 0.0)
+            {
+                return -3;
+            }
+            if (item.data.timeIgnored > 0.0)
+            {
+                if (item.data.IsFullyIgnored())
+                    return -2;
+                else
+                    return -1;
+            }
+
+            return 0;
+        }
+
+        public bool ShowingHorizontalScroll
+        {
+            get
+            {
+                return showingHorizontalScrollBar;
+            }
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            var item = (ProfileTreeViewItem)args.item;
+
+            var clipRect = m_2D.GetClipRect();
+            clipRect.y = state.scrollPos.y;
+            clipRect.x = state.scrollPos.x;
+            m_2D.SetClipRect(clipRect);
+
+            if (item.cachedRowString == null)
+            {
+                GenerateStrings(item);
+            }
+
+            for (int i = 0; i < args.GetNumVisibleColumns(); ++i)
+            {
+                CellGUI(args.GetCellRect(i), item, (MyColumns)args.GetColumn(i), ref args);
+            }
+            m_2D.ClearClipRect();
+        }
+
+        string ToDisplayUnits(float ms, bool showUnits = false, bool showFullValueWhenBelowZero = false)
+        {
+            return m_ProfileAnalyzerWindow.ToDisplayUnits(ms, showUnits, 0, showFullValueWhenBelowZero);
+        }
+
+        string ToDisplayUnits(double ms, bool showUnits = false, bool showFullValueWhenBelowZero = false)
+        {
+            return m_ProfileAnalyzerWindow.ToDisplayUnits(ms, showUnits, 0, showFullValueWhenBelowZero);
+        }
+
+        string ToTooltipDisplayUnits(float ms, bool showUnits = false, int onFrame = -1)
+        {
+            return m_ProfileAnalyzerWindow.ToTooltipDisplayUnits(ms, showUnits, onFrame);
+        }
+
+        string ToTooltipDisplayUnits(double ms, bool showUnits = false, int onFrame = -1)
+        {
+            return ToTooltipDisplayUnits((float)ms, showUnits, onFrame);
+        }
+
+        GUIContent ToDisplayUnitsWithTooltips(float ms, bool showUnits = false, int onFrame = -1)
+        {
+            return m_ProfileAnalyzerWindow.ToDisplayUnitsWithTooltips(ms, showUnits, onFrame);
+        }
+
+        GUIContent ToDisplayUnitsWithTooltips(double ms, bool showUnits = false, int onFrame = -1)
+        {
+            return ToDisplayUnitsWithTooltips((float)ms, showUnits, onFrame);
+        }
+
+        void CopyToClipboard(Event current, string text)
+        {
+            EditorGUIUtility.systemCopyBuffer = text;
+        }
+
+        GenericMenu GenerateActiveContextMenu(string markerName, Event evt, GUIContent content)
+        {
+            GenericMenu menu = new GenericMenu();
+
+            menu.AddItem(Styles.menuItemSelectFramesInAll, false, () => m_ProfileAnalyzerWindow.SelectFramesContainingMarker(markerName, false));
+            menu.AddItem(Styles.menuItemSelectFramesInCurrent, false, () => m_ProfileAnalyzerWindow.SelectFramesContainingMarker(markerName, true));
+
+            if (m_ProfileAnalyzerWindow.AllSelected())
+                menu.AddDisabledItem(Styles.menuItemSelectFramesAll);
+            else
+                menu.AddItem(Styles.menuItemSelectFramesAll, false, () => m_ProfileAnalyzerWindow.SelectAllFrames());
+
+            menu.AddSeparator("");
+            if (!m_ProfileAnalyzerWindow.GetNameFilters().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddItem(Styles.menuItemAddToIncludeFilter, false, () => m_ProfileAnalyzerWindow.AddToIncludeFilter(markerName));
+            else
+                menu.AddItem(Styles.menuItemRemoveFromIncludeFilter, false, () => m_ProfileAnalyzerWindow.RemoveFromIncludeFilter(markerName));
+            if (!m_ProfileAnalyzerWindow.GetNameExcludes().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddItem(Styles.menuItemAddToExcludeFilter, false, () => m_ProfileAnalyzerWindow.AddToExcludeFilter(markerName));
+            else
+                menu.AddItem(Styles.menuItemRemoveFromExcludeFilter, false, () => m_ProfileAnalyzerWindow.RemoveFromExcludeFilter(markerName));
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemSetAsParentMarkerFilter, false, () => m_ProfileAnalyzerWindow.SetAsParentMarkerFilter(markerName));
+            menu.AddItem(Styles.menuItemClearParentMarkerFilter, false, () => m_ProfileAnalyzerWindow.SetAsParentMarkerFilter(""));
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemSetAsRemoveMarker, false, () => m_ProfileAnalyzerWindow.SetAsRemoveMarker(markerName));
+            menu.AddSeparator("");
+            if (markerName != null && !string.IsNullOrEmpty(markerName))
+                menu.AddItem(Styles.menuItemCopyToClipboard, false, () => CopyToClipboard(evt, markerName));
+
+            return menu;
+        }
+
+        GenericMenu GenerateDisabledContextMenu(string markerName, GUIContent content)
+        {
+            GenericMenu menu = new GenericMenu();
+
+            menu.AddDisabledItem(Styles.menuItemSelectFramesInAll);
+            menu.AddDisabledItem(Styles.menuItemSelectFramesInCurrent);
+            menu.AddDisabledItem(Styles.menuItemSelectFramesAll);
+
+            menu.AddSeparator("");
+            if (!m_ProfileAnalyzerWindow.GetNameFilters().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddDisabledItem(Styles.menuItemAddToIncludeFilter);
+            else
+                menu.AddDisabledItem(Styles.menuItemRemoveFromIncludeFilter);
+            if (!m_ProfileAnalyzerWindow.GetNameExcludes().Contains(markerName, StringComparer.OrdinalIgnoreCase))
+                menu.AddDisabledItem(Styles.menuItemAddToExcludeFilter);
+            else
+                menu.AddDisabledItem(Styles.menuItemRemoveFromExcludeFilter);
+            menu.AddSeparator("");
+            menu.AddDisabledItem(Styles.menuItemSetAsParentMarkerFilter);
+            menu.AddDisabledItem(Styles.menuItemClearParentMarkerFilter);
+            menu.AddSeparator("");
+            menu.AddDisabledItem(Styles.menuItemSetAsRemoveMarker);
+            menu.AddSeparator("");
+            if (content != null && !string.IsNullOrEmpty(content.text))
+                menu.AddDisabledItem(Styles.menuItemCopyToClipboard);
+
+            return menu;
+        }
+
+
+        void ShowContextMenu(Rect cellRect, string markerName, GUIContent content)
+        {
+            Event current = Event.current;
+            if (cellRect.Contains(current.mousePosition) && current.type == EventType.ContextClick)
+            {
+                GenericMenu menu;
+                if (!m_ProfileAnalyzerWindow.IsAnalysisRunning())
+                    menu = GenerateActiveContextMenu(markerName, current, content);
+                else
+                    menu = GenerateDisabledContextMenu(markerName, content);
+
+                menu.ShowAsContext();
+
+                current.Use();
+            }
+        }
+
+        void ShowText(Rect rect, string text)
+        {
+            EditorGUI.LabelField(rect, text);
+            //EditorGUI.TextArea(rect, text);
+        }
+
+        void ShowText(Rect rect, GUIContent content)
+        {
+            EditorGUI.LabelField(rect, content);
+            //ShowText(rect, content.text);
+        }
+
+        void GenerateStrings(ProfileTreeViewItem item)
+        {
+            item.cachedRowString = new GUIContent[m_MaxColumns];
+
+            int medianFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(item.data.medianFrameIndex, m_DataView);
+            int minFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(item.data.minFrameIndex, m_DataView);
+            int maxFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(item.data.maxFrameIndex, m_DataView);
+            int firstFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(item.data.firstFrameIndex, m_DataView);
+            int frameSummaryMedianFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(m_DataView.analysis.GetFrameSummary().medianFrameIndex, m_DataView);
+
+            if (item.data.timeRemoved > 0.0)
+            {
+                item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name + " [Modified]", item.data.name + "\n\nTime reduced by removing child marker time");
+                item.cachedRowString[(int)MyColumns.State] = new GUIContent("Modified", "Time reduced by removing child marker time");
+            }
+            else if (item.data.timeIgnored > 0.0)
+            {
+                if (item.data.IsFullyIgnored())
+                {
+                    item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name + " [Removed]", item.data.name + "\n\nAll marker time removed");
+                    item.cachedRowString[(int)MyColumns.State] = new GUIContent("Removed", "All marker time removed");
+                }
+                else
+                {
+                    item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name + " [Partial Removal]", item.data.name + "\n\nSome marker time removed (some instances)");
+                    item.cachedRowString[(int)MyColumns.State] = new GUIContent("Partial Removal", "Some marker time removed (some instances)");
+                }
+            }
+            else
+            {
+                item.cachedRowString[(int)MyColumns.Name] = new GUIContent(item.data.name, item.data.name);
+                item.cachedRowString[(int)MyColumns.State] = new GUIContent("", "");
+            }
+            item.cachedRowString[(int)MyColumns.Mean] = ToDisplayUnitsWithTooltips(item.data.msMean, false);
+            item.cachedRowString[(int)MyColumns.Depth] = (item.data.minDepth == item.data.maxDepth) ? new GUIContent(string.Format("{0}", item.data.minDepth), "") : new GUIContent(string.Format("{0}-{1}", item.data.minDepth, item.data.maxDepth), "");
+            item.cachedRowString[(int)MyColumns.Median] = ToDisplayUnitsWithTooltips(item.data.msMedian, false, medianFrameIndex);
+            string tooltip = ToTooltipDisplayUnits(item.data.msMedian, true, medianFrameIndex);
+            item.cachedRowString[(int)MyColumns.MedianBar] = new GUIContent("", tooltip);
+            item.cachedRowString[(int)MyColumns.StandardDeviation] = ToDisplayUnitsWithTooltips(item.data.msStandardDeviation, false);
+            item.cachedRowString[(int)MyColumns.Min] = ToDisplayUnitsWithTooltips(item.data.msMin, false, minFrameIndex);
+            item.cachedRowString[(int)MyColumns.Max] = ToDisplayUnitsWithTooltips(item.data.msMax, false, maxFrameIndex);
+            item.cachedRowString[(int)MyColumns.Range] = ToDisplayUnitsWithTooltips(item.data.msMax - item.data.msMin);
+            item.cachedRowString[(int)MyColumns.Count] = new GUIContent(string.Format("{0}", item.data.count), "");
+            item.cachedRowString[(int)MyColumns.CountBar] = new GUIContent("", string.Format("{0}", item.data.count));
+            item.cachedRowString[(int)MyColumns.CountMean] = new GUIContent(string.Format(CultureInfo.InvariantCulture, "{0:f0}", item.data.countMean), "");
+            item.cachedRowString[(int)MyColumns.CountMeanBar] = new GUIContent("", string.Format(CultureInfo.InvariantCulture, "{0:f0}", item.data.countMean));
+            item.cachedRowString[(int)MyColumns.CountStandardDeviation] = new GUIContent(string.Format(CultureInfo.InvariantCulture, "{0:f0}", item.data.countStandardDeviation), string.Format(CultureInfo.InvariantCulture, "{0}", item.data.countStandardDeviation));
+            item.cachedRowString[(int)MyColumns.FirstFrame] = new GUIContent(firstFrameIndex.ToString());
+            item.cachedRowString[(int)MyColumns.AtMedian] = ToDisplayUnitsWithTooltips(item.data.msAtMedian, false, frameSummaryMedianFrameIndex);
+            item.cachedRowString[(int)MyColumns.Total] = ToDisplayUnitsWithTooltips(item.data.msTotal);
+            tooltip = ToTooltipDisplayUnits(item.data.msTotal, true, medianFrameIndex);
+            item.cachedRowString[(int)MyColumns.TotalBar] = new GUIContent("", tooltip);
+
+            string threadNames = GetThreadNames(item);
+            item.cachedRowString[(int)MyColumns.Threads] = new GUIContent(threadNames, threadNames);
+        }
+
+        void ShowBar(Rect rect, float ms, float range, GUIContent content)
+        {
+            if (ms > 0.0f)
+            {
+                if (m_2D.DrawStart(rect))
+                {
+                    float w = Math.Max(1.0f, rect.width * ms / range);
+                    m_2D.DrawFilledBox(0, 1, w, rect.height - 1, m_BarColor);
+                    m_2D.DrawEnd();
+                }
+            }
+            GUI.Label(rect, content);
+        }
+
+        void CellGUI(Rect cellRect, ProfileTreeViewItem item, MyColumns column, ref RowGUIArgs args)
+        {
+            // Center cell rect vertically (makes it easier to place controls, icons etc in the cells)
+            CenterRectUsingSingleLineHeight(ref cellRect);
+
+            GUIContent content = item.cachedRowString[(int)column];
+            switch (column)
+            {
+                case MyColumns.Name:
+                {
+                    args.rowRect = cellRect;
+                    //base.RowGUI(args);
+                    //content = new GUIContent(item.data.name, item.data.name);
+                    ShowText(cellRect, content);
+                }
+                break;
+
+                case MyColumns.State:
+                case MyColumns.Mean:
+                case MyColumns.Depth:
+                case MyColumns.Median:
+                case MyColumns.StandardDeviation:
+                case MyColumns.Min:
+                case MyColumns.Max:
+                case MyColumns.Range:
+                case MyColumns.Count:
+                case MyColumns.CountMean:
+                case MyColumns.CountStandardDeviation:
+                case MyColumns.AtMedian:
+                case MyColumns.Total:
+                case MyColumns.Threads:
+                    ShowText(cellRect, content);
+                    break;
+                case MyColumns.MedianBar:
+                    ShowBar(cellRect, item.data.msMedian, m_MaxMedian, content);
+                    break;
+                case MyColumns.TotalBar:
+                    ShowBar(cellRect, (float)item.data.msTotal, (float)m_MaxTotal, content);
+                    break;
+                case MyColumns.CountBar:
+                    ShowBar(cellRect, item.data.count, m_MaxCount, content);
+                    break;
+                case MyColumns.CountMeanBar:
+                    ShowBar(cellRect, item.data.countMean, m_MaxCountMean, content);
+                    break;
+                case MyColumns.FirstFrame:
+                    if (!m_ProfileAnalyzerWindow.IsProfilerWindowOpen() || !m_DataView.inSyncWithProfilerData)
+                        GUI.enabled = false;
+                    if (GUI.Button(cellRect, content))
+                    {
+                        m_ProfileAnalyzerWindow.SelectMarkerByIndex(item.id);
+                        m_ProfileAnalyzerWindow.JumpToFrame(item.data.firstFrameIndex, m_DataView.data);
+                    }
+
+                    GUI.enabled = true;
+                    break;
+            }
+
+            ShowContextMenu(cellRect, item.data.name, content);
+        }
+
+        // Misc
+        //--------
+
+        protected override bool CanMultiSelect(TreeViewItem item)
+        {
+            return false;
+        }
+
+        struct HeaderData
+        {
+            public readonly GUIContent content;
+            public readonly float width;
+            public readonly float minWidth;
+            public readonly bool autoResize;
+            public readonly bool allowToggleVisibility;
+            public readonly bool ascending;
+
+            public HeaderData(string name, string tooltip = "", float width = 50, float minWidth = 30, bool autoResize = true, bool allowToggleVisibility = true, bool ascending = false)
+            {
+                content = new GUIContent(name, tooltip);
+                this.width = width;
+                this.minWidth = minWidth;
+                this.autoResize = autoResize;
+                this.allowToggleVisibility = allowToggleVisibility;
+                this.ascending = ascending;
+            }
+        }
+
+        public static MultiColumnHeaderState CreateDefaultMultiColumnHeaderState(MarkerColumnFilter modeFilter)
+        {
+            var columnList = new List<MultiColumnHeaderState.Column>();
+            HeaderData[] headerData = new HeaderData[]
+            {
+                new HeaderData("Marker Name", "Marker Name\n\nFrame marker time is total of all instances in frame", width: 300, minWidth: 100, autoResize: false, allowToggleVisibility: false, ascending: true),
+                new HeaderData("State", "Status of marker entry (if modified or removed from frame time due to 'Remove' filter)"),
+                new HeaderData("Depth", "Marker depth in marker hierarchy\n\nMay appear at multiple levels"),
+                new HeaderData("Median", "Central marker time over all selected frames\n\nAlways present in data set\n1st of 2 central values for even frame count"),
+                new HeaderData("Median Bar", "Central marker time over all selected frames", width: 50),
+                new HeaderData("Mean", "Per frame marker time / number of non zero frames"),
+                new HeaderData("SD", "Standard deviation in marker times"),
+                new HeaderData("Min", "Minimum marker time"),
+                new HeaderData("Max", "Maximum marker time"),
+                new HeaderData("Range", "Difference between maximum and minimum"),
+                new HeaderData("Count", "Marker count over all selected frames\n\nMultiple can occur per frame"),
+                new HeaderData("Count Bar", "Marker count over all selected frames\n\nMultiple can occur per frame"),
+                new HeaderData("Count Frame", "Average number of markers per frame\n\ntotal count / number of non zero frames", width: 70, minWidth: 50),
+                new HeaderData("Count Frame Bar", "Average number of markers per frame\n\ntotal count / number of non zero frames", width: 70, minWidth: 50),
+                new HeaderData("Count SD", "Standard deviation in marker per frame counts"),
+                new HeaderData("1st", "First frame index that the marker appears on"),
+                new HeaderData("At Median Frame", "Marker time on the median frame\n\nI.e. Marker total duration on the average frame", width: 90, minWidth: 50),
+                new HeaderData("Total", "Marker total time over all selected frames"),
+                new HeaderData("Total Bar", "Marker total time over all selected frames"),
+                new HeaderData("Threads", "Threads the marker occurs on (with filtering applied)"),
+            };
+            foreach (var header in headerData)
+            {
+                columnList.Add(new MultiColumnHeaderState.Column
+                {
+                    headerContent = header.content,
+                    headerTextAlignment = TextAlignment.Left,
+                    sortedAscending = header.ascending,
+                    sortingArrowAlignment = TextAlignment.Left,
+                    width = header.width,
+                    minWidth = header.minWidth,
+                    autoResize = header.autoResize,
+                    allowToggleVisibility = header.allowToggleVisibility
+                });
+            }
+            ;
+            var columns = columnList.ToArray();
+
+            m_MaxColumns = Enum.GetValues(typeof(MyColumns)).Length;
+            Assert.AreEqual(columns.Length, m_MaxColumns, "Number of columns should match number of enum values: You probably forgot to update one of them.");
+
+            var state = new MultiColumnHeaderState(columns);
+            SetMode(modeFilter, state);
+            return state;
+        }
+
+        protected override void SelectionChanged(IList<int> selectedIds)
+        {
+            base.SelectionChanged(selectedIds);
+
+            if (selectedIds.Count > 0)
+            {
+                m_ProfileAnalyzerWindow.SelectMarkerByIndex(selectedIds[0]);
+                // A newly selected marker changes the marker summary's GUI content, conflicting with the previous layout pass. We need to exit GUI and re-layout.
+                GUIUtility.ExitGUI();
+            }
+        }
+
+        static int[] GetDefaultVisibleColumns(MarkerColumnFilter.Mode mode)
+        {
+            int[] visibleColumns;
+
+            switch (mode)
+            {
+                default:
+                case MarkerColumnFilter.Mode.Custom:
+                case MarkerColumnFilter.Mode.TimeAndCount:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Depth,
+                        (int)MyColumns.Median,
+                        (int)MyColumns.MedianBar,
+                        (int)MyColumns.Mean,
+                        (int)MyColumns.Min,
+                        (int)MyColumns.Max,
+                        (int)MyColumns.Range,
+                        (int)MyColumns.Count,
+                        (int)MyColumns.CountMean,
+                        (int)MyColumns.AtMedian,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Time:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Depth,
+                        (int)MyColumns.Median,
+                        (int)MyColumns.MedianBar,
+                        (int)MyColumns.Min,
+                        (int)MyColumns.Max,
+                        (int)MyColumns.Range,
+                        (int)MyColumns.AtMedian,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Totals:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Depth,
+                        (int)MyColumns.Total,
+                        (int)MyColumns.TotalBar,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.TimeWithTotals:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Depth,
+                        (int)MyColumns.Median,
+                        (int)MyColumns.MedianBar,
+                        (int)MyColumns.Min,
+                        (int)MyColumns.Max,
+                        (int)MyColumns.Range,
+                        (int)MyColumns.AtMedian,
+                        (int)MyColumns.Total,
+                        (int)MyColumns.TotalBar,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.CountTotals:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Depth,
+                        (int)MyColumns.Count,
+                        (int)MyColumns.CountBar,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.CountPerFrame:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Depth,
+                        (int)MyColumns.CountMean,
+                        (int)MyColumns.CountMeanBar,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Depth:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Depth,
+                    };
+                    break;
+                case MarkerColumnFilter.Mode.Threads:
+                    visibleColumns = new int[]
+                    {
+                        (int)MyColumns.Name,
+                        (int)MyColumns.Threads,
+                    };
+                    break;
+            }
+
+            return visibleColumns;
+        }
+
+        static void SetMode(MarkerColumnFilter modeFilter, MultiColumnHeaderState state)
+        {
+            switch (modeFilter.mode)
+            {
+                case MarkerColumnFilter.Mode.Custom:
+                    if (modeFilter.visibleColumns == null)
+                        state.visibleColumns = GetDefaultVisibleColumns(modeFilter.mode);
+                    else
+                        state.visibleColumns = modeFilter.visibleColumns;
+                    break;
+                default:
+                    state.visibleColumns = GetDefaultVisibleColumns(modeFilter.mode);
+                    break;
+            }
+
+            if (modeFilter.visibleColumns == null)
+                modeFilter.visibleColumns = state.visibleColumns;
+        }
+
+        public void SetMode(MarkerColumnFilter modeFilter)
+        {
+            SetMode(modeFilter, multiColumnHeader.state);
+            multiColumnHeader.ResizeToFit();
+        }
+    }
+
+    static class MyExtensionMethods
+    {
+        public static IOrderedEnumerable<T> Order<T, TKey>(this IEnumerable<T> source, Func<T, TKey> selector, bool ascending)
+        {
+            if (ascending)
+            {
+                return source.OrderBy(selector);
+            }
+            else
+            {
+                return source.OrderByDescending(selector);
+            }
+        }
+
+        public static IOrderedEnumerable<T> ThenBy<T, TKey>(this IOrderedEnumerable<T> source, Func<T, TKey> selector, bool ascending)
+        {
+            if (ascending)
+            {
+                return source.ThenBy(selector);
+            }
+            else
+            {
+                return source.ThenByDescending(selector);
+            }
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileTable.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileTable.cs.meta
new file mode 100644
index 0000000..1cefcdd
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfileTable.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 981ca102f47f145c1977153854cce718
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfilerWindowInterface.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfilerWindowInterface.cs
new file mode 100644
index 0000000..67eaf58
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfilerWindowInterface.cs
@@ -0,0 +1,854 @@
+using UnityEditorInternal;
+using System.Reflection;
+using System;
+using System.Collections;
+using UnityEngine;
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine.Profiling;
+using UnityEditor.Profiling;
+#if UNITY_2021_2_OR_NEWER
+using Unity.Profiling.Editor;
+// stub so that ProfilerWindow can be moved to this namespace in trunk without a need to change PA
+namespace Unity.Profiling.Editor {}
+#endif
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class ProfilerWindowInterface
+    {
+        bool m_ProfilerWindowInitialized = false;
+        const float k_NsToMs = 1000000;
+        ProgressBarDisplay m_progressBar;
+
+        [NonSerialized] bool m_SendingSelectionEventToProfilerWindowInProgress = false;
+        [NonSerialized] int m_LastSelectedFrameInProfilerWindow = 0;
+
+#if UNITY_2021_1_OR_NEWER
+        [NonSerialized] ProfilerWindow m_ProfilerWindow;
+        [NonSerialized] IProfilerFrameTimeViewSampleSelectionController m_CpuProfilerModule;
+#else
+        Type m_ProfilerWindowType;
+        EditorWindow m_ProfilerWindow;
+        FieldInfo m_CurrentFrameFieldInfo;
+        FieldInfo m_TimeLineGUIFieldInfo;
+        FieldInfo m_SelectedEntryFieldInfo;
+        FieldInfo m_SelectedNameFieldInfo;
+        FieldInfo m_SelectedTimeFieldInfo;
+        FieldInfo m_SelectedDurationFieldInfo;
+        FieldInfo m_SelectedInstanceIdFieldInfo;
+        FieldInfo m_SelectedFrameIdFieldInfo;
+        FieldInfo m_SelectedThreadIndexFieldInfo;
+        FieldInfo m_SelectedNativeIndexFieldInfo;
+        FieldInfo m_SelectedInstanceCountFieldInfo;
+        FieldInfo m_SelectedInstanceCountForThreadFieldInfo;
+        FieldInfo m_SelectedInstanceCountForFrameFieldInfo;
+        FieldInfo m_SelectedMetaDataFieldInfo;
+        FieldInfo m_SelectedThreadCountFieldInfo;
+        FieldInfo m_SelectedCallstackInfoFieldInfo;
+
+        MethodInfo m_GetProfilerModuleInfo;
+        Type m_CPUProfilerModuleType;
+#endif
+
+        public ProfilerWindowInterface(ProgressBarDisplay progressBar)
+        {
+            m_progressBar = progressBar;
+
+#if !UNITY_2021_1_OR_NEWER
+            Assembly assem = typeof(Editor).Assembly;
+            m_ProfilerWindowType = assem.GetType("UnityEditor.ProfilerWindow");
+            m_CurrentFrameFieldInfo = m_ProfilerWindowType.GetField("m_CurrentFrame", BindingFlags.NonPublic | BindingFlags.Instance);
+
+            m_TimeLineGUIFieldInfo = m_ProfilerWindowType.GetField("m_CPUTimelineGUI", BindingFlags.NonPublic | BindingFlags.Instance);
+            if (m_TimeLineGUIFieldInfo == null)
+            {
+                // m_CPUTimelineGUI isn't present in 2019.3.0a8 onward
+                m_GetProfilerModuleInfo = m_ProfilerWindowType.GetMethod("GetProfilerModule", BindingFlags.NonPublic | BindingFlags.Instance);
+                if (m_GetProfilerModuleInfo == null)
+                {
+                    Debug.Log("Unable to initialise link to Profiler Timeline, no GetProfilerModule found");
+                }
+
+                m_CPUProfilerModuleType = assem.GetType("UnityEditorInternal.Profiling.CPUProfilerModule");
+                m_TimeLineGUIFieldInfo = m_CPUProfilerModuleType.GetField("m_TimelineGUI", BindingFlags.NonPublic | BindingFlags.Instance);
+                if (m_TimeLineGUIFieldInfo == null)
+                {
+                    Debug.Log("Unable to initialise link to Profiler Timeline");
+                }
+            }
+
+            if (m_TimeLineGUIFieldInfo != null)
+                m_SelectedEntryFieldInfo = m_TimeLineGUIFieldInfo.FieldType.GetField("m_SelectedEntry", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+            if (m_SelectedEntryFieldInfo != null)
+            {
+                m_SelectedNameFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("name", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedTimeFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("time", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedDurationFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("duration", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedInstanceIdFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("instanceId", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedFrameIdFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("frameId", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                // confusingly this is called threadId but is the thread _index_
+                m_SelectedThreadIndexFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("threadId", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedNativeIndexFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("nativeIndex", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedInstanceCountFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("instanceCount", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedInstanceCountForThreadFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("instanceCountForThread", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedInstanceCountForFrameFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("instanceCountForFrame", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedThreadCountFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("threadCount", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedMetaDataFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("metaData", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                m_SelectedCallstackInfoFieldInfo = m_SelectedEntryFieldInfo.FieldType.GetField("callstackInfo", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+            }
+#endif
+        }
+
+        public bool IsReady()
+        {
+            return m_ProfilerWindow != null && m_ProfilerWindowInitialized;
+        }
+
+        public void GetProfilerWindowHandle()
+        {
+            Profiler.BeginSample("GetProfilerWindowHandle");
+#if UNITY_2021_1_OR_NEWER
+            if (m_CpuProfilerModule != null)
+            {
+                m_CpuProfilerModule.selectionChanged -= OnSelectionChangedInCpuProfilerModule;
+                m_CpuProfilerModule = null;
+            }
+
+            var windows = Resources.FindObjectsOfTypeAll<ProfilerWindow>();
+            if (windows != null && windows.Length > 0)
+                m_ProfilerWindow = windows[0];
+            if (m_ProfilerWindow != null)
+            {
+#if UNITY_2021_2_OR_NEWER
+                var cpuModuleIdentifier = ProfilerWindow.cpuModuleIdentifier;
+#else
+                var cpuModuleIdentifier = ProfilerWindow.cpuModuleName;
+#endif
+                m_CpuProfilerModule =
+                    m_ProfilerWindow.GetFrameTimeViewSampleSelectionController(cpuModuleIdentifier);
+                m_CpuProfilerModule.selectionChanged -= OnSelectionChangedInCpuProfilerModule;
+                m_CpuProfilerModule.selectionChanged += OnSelectionChangedInCpuProfilerModule;
+
+                m_ProfilerWindow.Repaint();
+                m_ProfilerWindowInitialized = false;
+                // wait a frame for the Profiler to get Repainted
+                EditorApplication.delayCall += () => m_ProfilerWindowInitialized = true;
+            }
+#else
+            UnityEngine.Object[] windows = Resources.FindObjectsOfTypeAll(m_ProfilerWindowType);
+            if (windows != null && windows.Length > 0)
+                m_ProfilerWindow = (EditorWindow)windows[0];
+            m_ProfilerWindowInitialized = true;
+#endif
+            Profiler.EndSample();
+        }
+
+        public void OpenProfilerOrUseExisting()
+        {
+            // Note we use existing if possible to fix a bug after domain reload
+            // Where calling EditorWindow.GetWindow directly causes a second window to open
+            if (m_ProfilerWindow == null)
+            {
+#if UNITY_2021_1_OR_NEWER
+                m_ProfilerWindow = EditorWindow.GetWindow<ProfilerWindow>();
+#if UNITY_2021_2_OR_NEWER
+                var cpuModuleIdentifier = ProfilerWindow.cpuModuleIdentifier;
+#else
+                var cpuModuleIdentifier = ProfilerWindow.cpuModuleName;
+#endif
+                m_CpuProfilerModule = m_ProfilerWindow.GetFrameTimeViewSampleSelectionController(cpuModuleIdentifier);
+                m_CpuProfilerModule.selectionChanged -= OnSelectionChangedInCpuProfilerModule;
+                m_CpuProfilerModule.selectionChanged += OnSelectionChangedInCpuProfilerModule;
+#else
+                // Create new
+                m_ProfilerWindow = EditorWindow.GetWindow(m_ProfilerWindowType);
+#endif
+            }
+        }
+
+        public bool GetFrameRangeFromProfiler(out int first, out int last)
+        {
+            if (m_ProfilerWindow != null)
+            {
+                first = 1 + ProfilerDriver.firstFrameIndex;
+                last = 1 + ProfilerDriver.lastFrameIndex;
+                return true;
+            }
+
+            first = 1;
+            last = 1;
+            return false;
+        }
+
+        public void CloseProfiler()
+        {
+            if (m_ProfilerWindow != null)
+                m_ProfilerWindow.Close();
+        }
+
+#if !UNITY_2021_1_OR_NEWER
+        object GetTimeLineGUI()
+        {
+            object timeLineGUI = null;
+
+            if (m_CPUProfilerModuleType != null)
+            {
+                object[] parametersArray = new object[] { ProfilerArea.CPU };
+                var getCPUProfilerModuleInfo = m_GetProfilerModuleInfo.MakeGenericMethod(m_CPUProfilerModuleType);
+                var cpuModule = getCPUProfilerModuleInfo.Invoke(m_ProfilerWindow, parametersArray);
+
+                timeLineGUI = m_TimeLineGUIFieldInfo.GetValue(cpuModule);
+            }
+            else if (m_TimeLineGUIFieldInfo != null)
+            {
+                timeLineGUI = m_TimeLineGUIFieldInfo.GetValue(m_ProfilerWindow);
+            }
+
+            return timeLineGUI;
+        }
+
+#endif
+
+
+#if UNITY_2021_1_OR_NEWER
+        private void OnSelectionChangedInCpuProfilerModule(IProfilerFrameTimeViewSampleSelectionController controller, ProfilerTimeSampleSelection selection)
+        {
+            if (controller == m_CpuProfilerModule && !m_SendingSelectionEventToProfilerWindowInProgress)
+            {
+                if (selection != null && selection.markerNamePath != null && selection.markerNamePath.Count > 0)
+                {
+                    selectedMarkerChanged(selection.markerNamePath[selection.markerNamePath.Count - 1], selection.threadGroupName, selection.threadName);
+                }
+            }
+        }
+
+#endif
+
+        public event Action<string, string, string> selectedMarkerChanged = delegate {};
+
+        public void PollProfilerWindowMarkerName()
+        {
+#if !UNITY_2021_1_OR_NEWER
+            if (m_ProfilerWindow != null)
+            {
+                var timeLineGUI = GetTimeLineGUI();
+                if (timeLineGUI != null && m_SelectedEntryFieldInfo != null)
+                {
+                    var selectedEntry = m_SelectedEntryFieldInfo.GetValue(timeLineGUI);
+                    if (selectedEntry != null && m_SelectedNameFieldInfo != null)
+                    {
+                        string threadGroupName = null;
+                        string threadName = null;
+                        if (m_SelectedFrameIdFieldInfo != null && m_SelectedThreadIndexFieldInfo != null)
+                        {
+                            using (RawFrameDataView frameData = ProfilerDriver.GetRawFrameDataView((int)m_SelectedFrameIdFieldInfo.GetValue(selectedEntry), (int)m_SelectedThreadIndexFieldInfo.GetValue(selectedEntry)))
+                            {
+                                if (frameData != null && frameData.valid)
+                                {
+                                    threadGroupName = frameData.threadGroupName;
+                                    threadName = frameData.threadName;
+                                }
+                            }
+                        }
+                        selectedMarkerChanged(m_SelectedNameFieldInfo.GetValue(selectedEntry).ToString(), threadGroupName, threadName);
+                    }
+                }
+            }
+#endif
+        }
+
+        public ProfileData PullFromProfiler(int firstFrameDisplayIndex, int lastFrameDisplayIndex)
+        {
+            Profiler.BeginSample("ProfilerWindowInterface.PullFromProfiler");
+
+            bool recording = IsRecording();
+            if (recording)
+                StopRecording();
+
+            int firstFrameIndex = Mathf.Max(firstFrameDisplayIndex - 1, 0);
+            int lastFrameIndex = lastFrameDisplayIndex - 1;
+            ProfileData profileData = GetData(firstFrameIndex, lastFrameIndex);
+
+            if (recording)
+                StartRecording();
+
+            Profiler.EndSample();
+            return profileData;
+        }
+
+        public int GetThreadCountForFrame(int frameIndex)
+        {
+            if (!IsReady())
+                return 0;
+
+            ProfilerFrameDataIterator frameData = new ProfilerFrameDataIterator();
+            frameData.SetRoot(frameIndex, 0);
+            return frameData.GetThreadCount(frameIndex);
+        }
+
+        public ProfileFrame GetProfileFrameForThread(int frameIndex, int threadIndex)
+        {
+            if (!IsReady())
+                return null;
+
+            var frame = new ProfileFrame();
+            using (RawFrameDataView frameData = ProfilerDriver.GetRawFrameDataView(frameIndex, threadIndex))
+            {
+                frame.msStartTime = frameData.frameStartTimeMs;
+                frame.msFrame = frameData.frameTimeMs;
+            }
+            return frame;
+        }
+
+        ProfileData GetDataRaw(ProfileData data, int firstFrameIndex, int lastFrameIndex)
+        {
+            bool firstError = true;
+
+            data.SetFrameIndexOffset(firstFrameIndex);
+
+            var depthStack = new Stack<int>();
+
+            var threadNameCount = new Dictionary<string, int>();
+            var markerIdToNameIndex = new Dictionary<int, int>();
+
+            for (int frameIndex = firstFrameIndex; frameIndex <= lastFrameIndex; ++frameIndex)
+            {
+                m_progressBar.AdvanceProgressBar();
+
+                int threadIndex = 0;
+
+                threadNameCount.Clear();
+                ProfileFrame frame = null;
+                while (true)
+                {
+                    using (RawFrameDataView frameData = ProfilerDriver.GetRawFrameDataView(frameIndex, threadIndex))
+                    {
+                        if (threadIndex == 0)
+                        {
+                            if ((frameIndex == firstFrameIndex || frameIndex == lastFrameIndex)
+                                && firstFrameIndex != lastFrameIndex && (!frameData.valid || frameData.frameTimeNs == 0))
+                            {
+                                // skip incomplete frames when they are at the beginning or end of the capture
+                                if (++frameIndex <= lastFrameIndex)
+                                {
+                                    data.FirstFrameIncomplete = true;
+                                    data.SetFrameIndexOffset(frameIndex);
+                                    continue;
+                                }
+                                else
+                                {
+                                    // break out entirely if this is the last frame
+                                    data.LastFrameIncomplete = true;
+                                    break;
+                                }
+                            }
+                            frame = new ProfileFrame();
+                            if (frameData.valid)
+                            {
+                                frame.msStartTime = frameData.frameStartTimeMs;
+                                frame.msFrame = frameData.frameTimeMs;
+                            }
+                            data.Add(frame);
+                        }
+
+                        if (!frameData.valid)
+                            break;
+
+                        string threadNameWithIndex = null;
+                        string threadName = frameData.threadName;
+                        if (threadName.Trim() == "")
+                        {
+                            Debug.Log(string.Format("Warning: Unnamed thread found on frame {0}. Corrupted data suspected, ignoring frame", frameIndex));
+                            threadIndex++;
+                            continue;
+                        }
+                        var groupName = frameData.threadGroupName;
+                        threadName = ProfileData.GetThreadNameWithGroup(threadName, groupName);
+
+                        int nameCount = 0;
+                        threadNameCount.TryGetValue(threadName, out nameCount);
+                        threadNameCount[threadName] = nameCount + 1;
+
+                        threadNameWithIndex = ProfileData.ThreadNameWithIndex(threadNameCount[threadName], threadName);
+
+                        var thread = new ProfileThread();
+                        data.AddThreadName(threadNameWithIndex, thread);
+
+                        frame.Add(thread);
+
+                        // The markers are in depth first order
+                        depthStack.Clear();
+                        // first sample is the thread name
+                        for (int i = 1; i < frameData.sampleCount; i++)
+                        {
+                            float durationMS = frameData.GetSampleTimeMs(i);
+                            int markerId = frameData.GetSampleMarkerId(i);
+                            if (durationMS < 0)
+                            {
+                                if (firstError)
+                                {
+                                    int displayIndex = data.OffsetToDisplayFrame(frameIndex);
+
+                                    string name = frameData.GetSampleName(i);
+                                    Debug.LogFormat("Ignoring Invalid marker time found for {0} on frame {1} on thread {2} ({3} < 0)",
+                                        name, displayIndex, threadName, durationMS);
+
+                                    firstError = false;
+                                }
+                            }
+                            else
+                            {
+                                int depth = 1 + depthStack.Count;
+                                var markerData = ProfileMarker.Create(durationMS, depth);
+
+                                // Use name index directly if we have already stored this named marker before
+                                int nameIndex;
+                                if (markerIdToNameIndex.TryGetValue(markerId, out nameIndex))
+                                {
+                                    markerData.nameIndex = nameIndex;
+                                }
+                                else
+                                {
+                                    string name = frameData.GetSampleName(i);
+                                    data.AddMarkerName(name, markerData);
+                                    markerIdToNameIndex[markerId] = markerData.nameIndex;
+                                }
+
+                                thread.AddMarker(markerData);
+                            }
+
+                            int childrenCount = frameData.GetSampleChildrenCount(i);
+                            if (childrenCount > 0)
+                            {
+                                depthStack.Push(childrenCount);
+                            }
+                            else
+                            {
+                                while (depthStack.Count > 0)
+                                {
+                                    int remainingChildren = depthStack.Pop();
+                                    if (remainingChildren > 1)
+                                    {
+                                        depthStack.Push(remainingChildren - 1);
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    threadIndex++;
+                }
+            }
+
+            data.Finalise();
+
+            return data;
+        }
+
+        ProfileData GetDataOriginal(ProfileData data, int firstFrameIndex, int lastFrameIndex)
+        {
+            ProfilerFrameDataIterator frameData = new ProfilerFrameDataIterator();
+            bool firstError = true;
+
+            data.SetFrameIndexOffset(firstFrameIndex);
+
+            Dictionary<string, int> threadNameCount = new Dictionary<string, int>();
+            for (int frameIndex = firstFrameIndex; frameIndex <= lastFrameIndex; ++frameIndex)
+            {
+                m_progressBar.AdvanceProgressBar();
+
+                int threadCount = frameData.GetThreadCount(frameIndex);
+                frameData.SetRoot(frameIndex, 0);
+
+                var msFrame = frameData.frameTimeMS;
+
+                if ((frameIndex == firstFrameIndex || frameIndex == lastFrameIndex)
+                    && firstFrameIndex != lastFrameIndex && msFrame == 0)
+                {
+                    var nextFrame = frameIndex + 1;
+                    // skip incomplete frames when they are at the beginning or end of the capture
+                    if (nextFrame <= lastFrameIndex)
+                    {
+                        data.FirstFrameIncomplete = true;
+                        data.SetFrameIndexOffset(nextFrame);
+                        continue;
+                    }
+                    else
+                    {
+                        // break out entirely if this is the last frame
+                        data.LastFrameIncomplete = true;
+                        break;
+                    }
+                }
+
+                /*
+                if (frameIndex == lastFrameIndex)
+                {
+                    // Check if last frame appears to be invalid data
+                    float median;
+                    float mean;
+                    float standardDeviation;
+                    CalculateFrameTimeStats(data, out median, out mean, out standardDeviation);
+                    float execessiveDeviation = (3f * standardDeviation);
+                    if (msFrame > (median + execessiveDeviation))
+                    {
+                        Debug.LogFormat("Dropping last frame as it is significantly larger than the median of the rest of the data set {0} > {1} (median {2} + 3 * standard deviation {3})", msFrame, median + execessiveDeviation, median, standardDeviation);
+                        break;
+                    }
+                    if (msFrame < (median - execessiveDeviation))
+                    {
+                        Debug.LogFormat("Dropping last frame as it is significantly smaller than the median of the rest of the data set {0} < {1} (median {2} - 3 * standard deviation {3})", msFrame, median - execessiveDeviation, median, standardDeviation);
+                        break;
+                    }
+                }
+                */
+
+                ProfileFrame frame = new ProfileFrame();
+                frame.msStartTime = 1000.0 * frameData.GetFrameStartS(frameIndex);
+                frame.msFrame = msFrame;
+                data.Add(frame);
+
+                threadNameCount.Clear();
+                for (int threadIndex = 0; threadIndex < threadCount; ++threadIndex)
+                {
+                    frameData.SetRoot(frameIndex, threadIndex);
+
+                    var threadName = frameData.GetThreadName();
+                    if (threadName.Trim() == "")
+                    {
+                        Debug.Log(string.Format("Warning: Unnamed thread found on frame {0}. Corrupted data suspected, ignoring frame", frameIndex));
+                        continue;
+                    }
+
+                    var groupName = frameData.GetGroupName();
+                    threadName = ProfileData.GetThreadNameWithGroup(threadName, groupName);
+
+                    ProfileThread thread = new ProfileThread();
+                    frame.Add(thread);
+
+                    int nameCount = 0;
+                    threadNameCount.TryGetValue(threadName, out nameCount);
+                    threadNameCount[threadName] = nameCount + 1;
+
+                    data.AddThreadName(ProfileData.ThreadNameWithIndex(threadNameCount[threadName], threadName), thread);
+
+                    const bool enterChildren = true;
+                    // The markers are in depth first order and the depth is known
+                    // So we can infer a parent child relationship
+                    while (frameData.Next(enterChildren))
+                    {
+                        if (frameData.durationMS < 0)
+                        {
+                            if (firstError)
+                            {
+                                int displayIndex = data.OffsetToDisplayFrame(frameIndex);
+
+                                Debug.LogFormat("Ignoring Invalid marker time found for {0} on frame {1} on thread {2} ({3} < 0) : Instance id : {4}",
+                                    frameData.name, displayIndex, threadName, frameData.durationMS, frameData.instanceId);
+
+                                firstError = false;
+                            }
+                            continue;
+                        }
+                        var markerData = ProfileMarker.Create(frameData);
+
+                        data.AddMarkerName(frameData.name, markerData);
+                        thread.AddMarker(markerData);
+                    }
+                }
+            }
+
+            data.Finalise();
+
+            frameData.Dispose();
+            return data;
+        }
+
+        ProfileData GetData(int firstFrameIndex, int lastFrameIndex)
+        {
+            ProfileData data = new ProfileData(ProfileAnalyzerWindow.TmpPath);
+            GetDataRaw(data, firstFrameIndex, lastFrameIndex);
+            data.Write();
+            return data;
+        }
+
+        public float GetFrameTimeRaw(int frameIndex)
+        {
+            using (RawFrameDataView frameData = ProfilerDriver.GetRawFrameDataView(frameIndex, 0))
+            {
+                if (!frameData.valid)
+                    return 0f;
+
+                return frameData.frameTimeMs;
+            }
+        }
+
+        public float GetFrameTime(int frameIndex)
+        {
+            return GetFrameTimeRaw(frameIndex);
+        }
+
+        struct ThreadIndexIterator
+        {
+            public ProfilerFrameDataIterator frameData;
+            public int threadIndex;
+        }
+
+        IEnumerator<ThreadIndexIterator> GetNextThreadIndexFittingThreadFilters(int frameIndex, List<string> threadFilters)
+        {
+            ProfilerFrameDataIterator frameData = new ProfilerFrameDataIterator();
+
+            int threadCount = frameData.GetThreadCount(frameIndex);
+            Dictionary<string, int> threadNameCount = new Dictionary<string, int>();
+            for (int threadIndex = 0; threadIndex < threadCount; ++threadIndex)
+            {
+                frameData.SetRoot(frameIndex, threadIndex);
+
+                var threadName = frameData.GetThreadName();
+                // Name here could be "Worker Thread 1"
+
+                var groupName = frameData.GetGroupName();
+                threadName = ProfileData.GetThreadNameWithGroup(threadName, groupName);
+
+                int nameCount = 0;
+                threadNameCount.TryGetValue(threadName, out nameCount);
+                threadNameCount[threadName] = nameCount + 1;
+
+                var threadNameWithIndex = ProfileData.ThreadNameWithIndex(threadNameCount[threadName], threadName);
+
+                // To compare on the filter we need to remove the postfix on the thread name
+                // "3:Worker Thread 0" -> "1:Worker Thread"
+                // The index of the thread (0) is used +1 as a prefix
+                // The preceding number (3) is the count of number of threads with this name
+                // Unfortunately multiple threads can have the same name
+                threadNameWithIndex = ProfileData.CorrectThreadName(threadNameWithIndex);
+
+                if (threadFilters.Contains(threadNameWithIndex))
+                {
+                    yield return new ThreadIndexIterator {frameData = frameData, threadIndex = threadIndex};
+                }
+            }
+            frameData.Dispose();
+        }
+
+        bool GetMarkerInfo(string markerName, int frameIndex, List<string> threadFilters, out int outThreadIndex, out int outNativeIndex, out float time, out float duration, out int instanceId)
+        {
+            outThreadIndex = 0;
+            outNativeIndex = 0;
+            time = 0.0f;
+            duration = 0.0f;
+            instanceId = 0;
+            bool found = false;
+
+            var iterator = GetNextThreadIndexFittingThreadFilters(frameIndex, threadFilters);
+            while (iterator.MoveNext())
+            {
+                const bool enterChildren = true;
+                while (iterator.Current.frameData.Next(enterChildren))
+                {
+                    if (iterator.Current.frameData.name == markerName)
+                    {
+                        time = iterator.Current.frameData.startTimeMS;
+                        duration = iterator.Current.frameData.durationMS;
+                        instanceId = iterator.Current.frameData.instanceId;
+                        outNativeIndex = iterator.Current.frameData.sampleId;
+                        outThreadIndex = iterator.Current.threadIndex;
+                        found = true;
+                        break;
+                    }
+                }
+
+                if (found)
+                    break;
+            }
+
+            return found;
+        }
+
+        public bool SetProfilerWindowMarkerName(string markerName, List<string> threadFilters)
+        {
+            m_SendingSelectionEventToProfilerWindowInProgress = true;
+            if (m_ProfilerWindow == null)
+                return false;
+#if UNITY_2021_1_OR_NEWER
+#if UNITY_2021_2_OR_NEWER
+            var cpuModuleIdentifier = ProfilerWindow.cpuModuleIdentifier;
+            var selectedModuleIdentifier = m_ProfilerWindow.selectedModuleIdentifier;
+#else
+            var cpuModuleIdentifier = ProfilerWindow.cpuModuleName;
+            var selectedModuleIdentifier = m_ProfilerWindow.selectedModuleName;
+#endif
+            m_CpuProfilerModule = m_ProfilerWindow.GetFrameTimeViewSampleSelectionController(cpuModuleIdentifier);
+            if (m_CpuProfilerModule != null && selectedModuleIdentifier == cpuModuleIdentifier
+                && m_ProfilerWindow.firstAvailableFrameIndex >= 0)
+            {
+                // Read profiler data direct from profile to find time/duration
+                int currentFrameIndex = (int)m_ProfilerWindow.selectedFrameIndex;
+
+                var iterator = GetNextThreadIndexFittingThreadFilters(currentFrameIndex, threadFilters);
+                while (iterator.MoveNext())
+                {
+                    using (var rawFrameDataView = ProfilerDriver.GetRawFrameDataView(currentFrameIndex, iterator.Current.threadIndex))
+                    {
+                        if (m_CpuProfilerModule.SetSelection(currentFrameIndex,
+                            rawFrameDataView.threadGroupName, rawFrameDataView.threadName, markerName,
+                            threadId: rawFrameDataView.threadId))
+                        {
+                            m_ProfilerWindow.Repaint();
+                            m_SendingSelectionEventToProfilerWindowInProgress = false;
+                            return true; // setting the selection was successful, nothing more to do here.
+                        }
+                    }
+                }
+                // selection couldn't be found, so clear the current one to avoid confusion
+                m_CpuProfilerModule.ClearSelection();
+                m_ProfilerWindow.Repaint();
+            }
+#else
+            var timeLineGUI = GetTimeLineGUI();
+            if (timeLineGUI == null)
+            {
+                m_SendingSelectionEventToProfilerWindowInProgress = false;
+                return false;
+            }
+
+            if (m_SelectedEntryFieldInfo != null)
+            {
+                var selectedEntry = m_SelectedEntryFieldInfo.GetValue(timeLineGUI);
+                if (selectedEntry != null)
+                {
+                    // Read profiler data direct from profile to find time/duration
+                    int currentFrameIndex = (int)m_CurrentFrameFieldInfo.GetValue(m_ProfilerWindow);
+                    float time;
+                    float duration;
+                    int instanceId;
+                    int nativeIndex;
+                    int threadIndex;
+                    if (GetMarkerInfo(markerName, currentFrameIndex, threadFilters, out threadIndex, out nativeIndex, out time, out duration, out instanceId))
+                    {
+                        /*
+                        Debug.Log(string.Format("Setting profiler to {0} on {1} at frame {2} at {3}ms for {4}ms ({5})",
+                                                markerName, currentFrameIndex, threadFilter, time, duration, instanceId));
+                         */
+
+                        if (m_SelectedNameFieldInfo != null)
+                            m_SelectedNameFieldInfo.SetValue(selectedEntry, markerName);
+                        if (m_SelectedTimeFieldInfo != null)
+                            m_SelectedTimeFieldInfo.SetValue(selectedEntry, time);
+                        if (m_SelectedDurationFieldInfo != null)
+                            m_SelectedDurationFieldInfo.SetValue(selectedEntry, duration);
+                        if (m_SelectedInstanceIdFieldInfo != null)
+                            m_SelectedInstanceIdFieldInfo.SetValue(selectedEntry, instanceId);
+                        if (m_SelectedFrameIdFieldInfo != null)
+                            m_SelectedFrameIdFieldInfo.SetValue(selectedEntry, currentFrameIndex);
+                        if (m_SelectedNativeIndexFieldInfo != null)
+                            m_SelectedNativeIndexFieldInfo.SetValue(selectedEntry, nativeIndex);
+                        if (m_SelectedThreadIndexFieldInfo != null)
+                            m_SelectedThreadIndexFieldInfo.SetValue(selectedEntry, threadIndex);
+
+                        // TODO : Update to fill in the total and number of instances.
+                        // For now we force Instance count to 1 to avoid the incorrect info showing.
+                        if (m_SelectedInstanceCountFieldInfo != null)
+                            m_SelectedInstanceCountFieldInfo.SetValue(selectedEntry, 1);
+                        if (m_SelectedInstanceCountForThreadFieldInfo != null)
+                            m_SelectedInstanceCountForThreadFieldInfo.SetValue(selectedEntry, 1);
+                        if (m_SelectedInstanceCountForFrameFieldInfo != null)
+                            m_SelectedInstanceCountForFrameFieldInfo.SetValue(selectedEntry, 1);
+                        if (m_SelectedThreadCountFieldInfo != null)
+                            m_SelectedThreadCountFieldInfo.SetValue(selectedEntry, 1);
+                        if (m_SelectedMetaDataFieldInfo != null)
+                            m_SelectedMetaDataFieldInfo.SetValue(selectedEntry, "");
+                        if (m_SelectedCallstackInfoFieldInfo != null)
+                            m_SelectedCallstackInfoFieldInfo.SetValue(selectedEntry, "");
+
+                        m_ProfilerWindow.Repaint();
+                        m_SendingSelectionEventToProfilerWindowInProgress = false;
+                        return true;
+                    }
+                }
+            }
+#endif
+            m_SendingSelectionEventToProfilerWindowInProgress = false;
+            return false;
+        }
+
+        public bool JumpToFrame(int index)
+        {
+            if (m_ProfilerWindow == null)
+                return false;
+
+            if (index - 1 < ProfilerDriver.firstFrameIndex)
+                return false;
+            if (index - 1 > ProfilerDriver.lastFrameIndex)
+                return false;
+
+#if UNITY_2021_1_OR_NEWER
+            m_ProfilerWindow.selectedFrameIndex = index - 1;
+#else
+            m_CurrentFrameFieldInfo.SetValue(m_ProfilerWindow, index - 1);
+#endif
+            m_ProfilerWindow.Repaint();
+            return true;
+        }
+
+        public int selectedFrame
+        {
+            get
+            {
+                if (m_ProfilerWindow == null)
+                    return 0;
+#if UNITY_2021_1_OR_NEWER
+                return (int)m_ProfilerWindow.selectedFrameIndex + 1;
+#else
+                return (int)m_CurrentFrameFieldInfo.GetValue(m_ProfilerWindow) + 1;
+#endif
+            }
+        }
+
+        public event Action<int> selectedFrameChanged = delegate {};
+
+        public void PollSelectedFrameChanges()
+        {
+            var currentlySelectedFrame = selectedFrame;
+            if (m_LastSelectedFrameInProfilerWindow != currentlySelectedFrame && !m_SendingSelectionEventToProfilerWindowInProgress)
+            {
+                m_LastSelectedFrameInProfilerWindow = currentlySelectedFrame;
+                selectedFrameChanged(currentlySelectedFrame);
+            }
+        }
+
+        public bool IsRecording()
+        {
+            return ProfilerDriver.enabled;
+        }
+
+        public void StopRecording()
+        {
+            // Stop recording first
+            ProfilerDriver.enabled = false;
+        }
+
+        public void StartRecording()
+        {
+            // Stop recording first
+            ProfilerDriver.enabled = true;
+        }
+
+        public void OnDisable()
+        {
+            if (m_ProfilerWindow != null)
+            {
+                m_ProfilerWindow = null;
+            }
+
+#if UNITY_2021_1_OR_NEWER
+            if (m_CpuProfilerModule != null)
+            {
+                m_CpuProfilerModule.selectionChanged -= OnSelectionChangedInCpuProfilerModule;
+                m_CpuProfilerModule = null;
+            }
+#endif
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfilerWindowInterface.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfilerWindowInterface.cs.meta
new file mode 100644
index 0000000..4e6e2bb
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProfilerWindowInterface.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d8e7ffaacab264ab6ba5aa70f432785f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProgressBarDisplay.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProgressBarDisplay.cs
new file mode 100644
index 0000000..ccab95a
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProgressBarDisplay.cs
@@ -0,0 +1,36 @@
+using UnityEngine;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class ProgressBarDisplay
+    {
+        int m_TotalFrames;
+        int m_CurrentFrame;
+        string m_Title;
+        string m_Description;
+
+        public void InitProgressBar(string title, string description, int frames)
+        {
+            m_CurrentFrame = 0;
+            m_TotalFrames = frames;
+
+            m_Title = title;
+            m_Description = description;
+
+            EditorUtility.DisplayProgressBar(m_Title, m_Description, m_CurrentFrame);
+        }
+
+        public void AdvanceProgressBar()
+        {
+            m_CurrentFrame++;
+            int currentFrame = Mathf.Clamp(0, m_CurrentFrame, m_TotalFrames);
+            float progress = m_TotalFrames > 0 ? (float)currentFrame / m_TotalFrames : 0f;
+            EditorUtility.DisplayProgressBar(m_Title, m_Description, progress);
+        }
+
+        public void ClearProgressBar()
+        {
+            EditorUtility.ClearProgressBar();
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProgressBarDisplay.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProgressBarDisplay.cs.meta
new file mode 100644
index 0000000..4471872
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ProgressBarDisplay.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c27dfe7bd1055403b9dac63caf69c135
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadData.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadData.cs
new file mode 100644
index 0000000..c270478
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadData.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class ThreadData
+    {
+        public string threadNameWithIndex;
+        public int threadGroupIndex;
+        public string threadGroupName;
+        public int threadsInGroup;
+        public List<ThreadFrameTime> frames = new List<ThreadFrameTime>();
+
+        public float msMedian;
+        public float msLowerQuartile;
+        public float msUpperQuartile;
+        public float msMin;
+        public float msMax;
+
+        public int medianFrameIndex;
+        public int minFrameIndex;
+        public int maxFrameIndex;
+
+        public ThreadData(string _threadName)
+        {
+            threadNameWithIndex = _threadName;
+
+            var info = threadNameWithIndex.Split(':');
+            threadGroupIndex = int.Parse(info[0]);
+            threadGroupName = info[1];
+            threadsInGroup = 1;
+
+            msMedian = 0.0f;
+            msLowerQuartile = 0.0f;
+            msUpperQuartile = 0.0f;
+            msMin = 0.0f;
+            msMax = 0.0f;
+
+            medianFrameIndex = -1;
+            minFrameIndex = -1;
+            maxFrameIndex = -1;
+        }
+
+        struct ThreadFrameTimeFrameComparer : IComparer<ThreadFrameTime>
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public int Compare(ThreadFrameTime x, ThreadFrameTime y)
+            {
+                if (x.frameIndex == y.frameIndex)
+                    return 0;
+                return x.frameIndex > y.frameIndex ? 1 : -1;
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public ThreadFrameTime? GetFrame(int frameIndex)
+        {
+            var index = frames.BinarySearch(new ThreadFrameTime(frameIndex, 0, 0), new ThreadFrameTimeFrameComparer());
+            return index >= 0 ? (ThreadFrameTime?)frames[index] : null;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadData.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadData.cs.meta
new file mode 100644
index 0000000..5aa5809
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadData.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b0c2bd11491424d188d23f3ae3e16b79
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadFrameTime.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadFrameTime.cs
new file mode 100644
index 0000000..c7bd150
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadFrameTime.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal struct ThreadFrameTime : IComparable<ThreadFrameTime>
+    {
+        public int frameIndex;
+        public float ms;
+        public float msIdle;
+
+        public ThreadFrameTime(int index, float msTime, float msTimeIdle)
+        {
+            frameIndex = index;
+            ms = msTime;
+            msIdle = msTimeIdle;
+        }
+
+        public int CompareTo(ThreadFrameTime other)
+        {
+            return ms.CompareTo(other.ms);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadFrameTime.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadFrameTime.cs.meta
new file mode 100644
index 0000000..2584744
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadFrameTime.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fb9ea80c859e94311bdc05e75704cede
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadIdentifier.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadIdentifier.cs
new file mode 100644
index 0000000..778b43b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadIdentifier.cs
@@ -0,0 +1,105 @@
+using System;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    /// <summary>
+    /// Individual Thread details
+    /// </summary>
+    internal struct ThreadIdentifier
+    {
+        /// <summary>Thread name with index combined. A profiler analyzer specific unique thread representation</summary>
+        public string threadNameWithIndex { get; private set; }
+        /// <summary>Thread name (may not be unique)</summary>
+        public string name { get; private set; }
+        /// <summary>Thread index. A 1 based id for threads with matching names. -1 indicates all threads with the same name, 0 if there is only one thread with this name</summary>
+        public int index { get; private set; }
+
+        /// <summary>Thread index id which means all threads of the same name</summary>
+        public static int kAll = -1;
+        /// <summary>Thread index id use when there is only one thread with this name</summary>
+        public static int kSingle = 0;
+
+        /// <summary>Initialise ThreadIdentifier</summary>
+        /// <param name="name">The thread name</param>
+        /// <param name="index">The thread index</param>
+        public ThreadIdentifier(string name, int index)
+        {
+            this.name = name;
+            this.index = index;
+            if (index == kAll)
+                threadNameWithIndex = string.Format("All:{0}", name);
+            else
+                threadNameWithIndex = string.Format("{0}:{1}", index, name);
+        }
+
+        /// <summary>Initialise ThreadIdentifier from another ThreadIdentifier</summary>
+        /// <param name="threadIdentifier">The other ThreadIdentifier</param>
+        public ThreadIdentifier(ThreadIdentifier threadIdentifier)
+        {
+            name = threadIdentifier.name;
+            index = threadIdentifier.index;
+            threadNameWithIndex = threadIdentifier.threadNameWithIndex;
+        }
+
+        /// <summary>Initialise ThreadIdentifier from a unique name</summary>
+        /// <param name="threadNameWithIndex">The unique name string (name with index)</param>
+        public ThreadIdentifier(string threadNameWithIndex)
+        {
+            this.threadNameWithIndex = threadNameWithIndex;
+
+            string[] tokens = threadNameWithIndex.Split(':');
+            if (tokens.Length >= 2)
+            {
+                name = tokens[1];
+                string indexString = tokens[0];
+                if (indexString == "All")
+                {
+                    index = kAll;
+                }
+                else
+                {
+                    int intValue;
+                    if (Int32.TryParse(tokens[0], out intValue))
+                        index = intValue;
+                    else
+                        index = kSingle;
+                }
+            }
+            else
+            {
+                index = kSingle;
+                name = threadNameWithIndex;
+            }
+        }
+
+        void UpdateThreadNameWithIndex()
+        {
+            if (index == kAll)
+                threadNameWithIndex = string.Format("All:{0}", name);
+            else
+                threadNameWithIndex = string.Format("{0}:{1}", index, name);
+        }
+
+        /// <summary>Set the name of the thread</summary>
+        /// <param name="newName">The name (without index)</param>
+        public void SetName(string newName)
+        {
+            name = newName;
+            UpdateThreadNameWithIndex();
+        }
+
+        /// <summary>Set the index of the thread name</summary>
+        /// <param name="newIndex">The index of the thread with the same name</param>
+        public void SetIndex(int newIndex)
+        {
+            index = newIndex;
+            UpdateThreadNameWithIndex();
+        }
+
+        /// <summary>Sets the index to indicate we want all threads (used for filtering against other ThreadIdentifiers)</summary>
+        public void SetAll()
+        {
+            SetIndex(kAll);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadIdentifier.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadIdentifier.cs.meta
new file mode 100644
index 0000000..ef53106
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadIdentifier.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 977c7fa7681d742d591608f4dbb8b6af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelection.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelection.cs
new file mode 100644
index 0000000..8cb4f8f
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelection.cs
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    [Serializable]
+    internal class ThreadSelection
+    {
+        public List<string> groups;
+        public List<string> selection;
+
+        public bool empty
+        {
+            get
+            {
+                return groups == null || selection == null || groups.Count == 0 && selection.Count == 0;
+            }
+        }
+
+        public ThreadSelection()
+        {
+            groups = new List<string>();
+            selection = new List<string>();
+        }
+
+        public ThreadSelection(ThreadSelection threadSelection)
+        {
+            groups = new List<string>();
+            selection = new List<string>();
+
+            Set(threadSelection);
+        }
+
+        public void SetAll()
+        {
+            groups.Clear();
+            selection.Clear();
+
+            ThreadIdentifier allThreadSelection = new ThreadIdentifier("All", ThreadIdentifier.kAll);
+            groups.Add(allThreadSelection.threadNameWithIndex);
+        }
+
+        public void Set(string name)
+        {
+            groups.Clear();
+            selection.Clear();
+            selection.Add(name);
+        }
+
+        public void SetGroup(string groupName)
+        {
+            groups.Clear();
+            selection.Clear();
+
+            ThreadIdentifier allThreadSelection = new ThreadIdentifier(groupName, ThreadIdentifier.kAll);
+            groups.Add(allThreadSelection.threadNameWithIndex);
+        }
+
+        public void Set(ThreadSelection threadSelection)
+        {
+            groups.Clear();
+            selection.Clear();
+
+            if (threadSelection.groups != null)
+                groups.AddRange(threadSelection.groups);
+            if (threadSelection.selection != null)
+                selection.AddRange(threadSelection.selection);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelection.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelection.cs.meta
new file mode 100644
index 0000000..44d4b2a
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelection.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: edb0539be3883af4b90ff66c35074ae0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelectionWindow.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelectionWindow.cs
new file mode 100644
index 0000000..97c808b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelectionWindow.cs
@@ -0,0 +1,959 @@
+using UnityEngine;
+using System.IO;
+using System;
+using System.Collections.Generic;
+using UnityEditor.IMGUI.Controls;
+using UnityEngine.Assertions;
+using System.Linq;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    class ThreadTreeViewItem : TreeViewItem
+    {
+        public readonly ThreadIdentifier threadIdentifier;
+
+        public ThreadTreeViewItem(int id, int depth, string displayName, ThreadIdentifier threadIdentifier) : base(id, depth, displayName)
+        {
+            this.threadIdentifier = threadIdentifier;
+        }
+    }
+
+    class ThreadTable : TreeView
+    {
+        const float kRowHeights = 20f;
+        readonly List<TreeViewItem> m_Rows = new List<TreeViewItem>(100);
+
+        List<string> m_ThreadNames;
+        List<string> m_ThreadUINames;
+        ThreadIdentifier m_AllThreadIdentifier;
+        ThreadSelection m_ThreadSelection;
+
+        GUIStyle activeLineStyle;
+
+        public bool StateChanged { get; private set; }
+
+        // All columns
+        public enum MyColumns
+        {
+            GroupName,
+            ThreadName,
+            State,
+        }
+
+        public enum SortOption
+        {
+            GroupName,
+            ThreadName,
+            State,
+        }
+
+        // Sort options per column
+        SortOption[] m_SortOptions =
+        {
+            SortOption.GroupName,
+            SortOption.ThreadName,
+            SortOption.State,
+        };
+
+        public enum ThreadSelected
+        {
+            Selected,
+            Partial,
+            NotSelected
+        };
+
+        public ThreadTable(TreeViewState state, MultiColumnHeader multicolumnHeader, List<string> threadNames, List<string> threadUINames, ThreadSelection threadSelection) : base(state, multicolumnHeader)
+        {
+            StateChanged = false;
+
+            m_AllThreadIdentifier = new ThreadIdentifier();
+            m_AllThreadIdentifier.SetName("All");
+            m_AllThreadIdentifier.SetAll();
+
+            Assert.AreEqual(m_SortOptions.Length, Enum.GetValues(typeof(MyColumns)).Length, "Ensure number of sort options are in sync with number of MyColumns enum values");
+
+            // Custom setup
+            rowHeight = kRowHeights;
+            showAlternatingRowBackgrounds = true;
+            columnIndexForTreeFoldouts = (int)(MyColumns.GroupName);
+            showBorder = true;
+            customFoldoutYOffset = (kRowHeights - EditorGUIUtility.singleLineHeight) * 0.5f; // center foldout in the row since we also center content. See RowGUI
+            // extraSpaceBeforeIconAndLabel = 0;
+            multicolumnHeader.sortingChanged += OnSortingChanged;
+            multicolumnHeader.visibleColumnsChanged += OnVisibleColumnsChanged;
+
+            m_ThreadNames = threadNames;
+            m_ThreadUINames = threadUINames;
+            m_ThreadSelection = new ThreadSelection(threadSelection);
+            this.foldoutOverride += DoFoldout;
+            Reload();
+        }
+
+        bool DoFoldout(Rect position, bool expandedstate, GUIStyle style)
+        {
+            return !(position.y < rowHeight) && GUI.Toggle(position, expandedstate, GUIContent.none, style);
+        }
+
+        public void ClearThreadSelection()
+        {
+            m_ThreadSelection.selection.Clear();
+            m_ThreadSelection.groups.Clear();
+
+            StateChanged = true;
+            Reload();
+        }
+
+        public void SelectMain()
+        {
+            m_ThreadSelection.selection.Clear();
+            m_ThreadSelection.groups.Clear();
+
+            foreach (var threadName in m_ThreadNames)
+            {
+                if (threadName.StartsWith("All:"))
+                    continue;
+
+                if (threadName.EndsWith(":Main Thread"))    // Usually just starts with 1:
+                    m_ThreadSelection.selection.Add(threadName);
+            }
+
+            StateChanged = true;
+            Reload();
+        }
+
+        public void SelectCommon()
+        {
+            m_ThreadSelection.selection.Clear();
+            m_ThreadSelection.groups.Clear();
+
+            foreach (var threadName in m_ThreadNames)
+            {
+                if (threadName.StartsWith("All:"))
+                    continue;
+
+                if (threadName.EndsWith(":Render Thread"))  // Usually just starts with 1:
+                    m_ThreadSelection.selection.Add(threadName);
+                if (threadName.EndsWith(":Main Thread"))    // Usually just starts with 1:
+                    m_ThreadSelection.selection.Add(threadName);
+                if (threadName.EndsWith(":Job.Worker"))     // Mulitple jobs, number depends on processor setup
+                    m_ThreadSelection.selection.Add(threadName);
+            }
+
+            StateChanged = true;
+            Reload();
+        }
+
+        public ThreadSelection GetThreadSelection()
+        {
+            return m_ThreadSelection;
+        }
+
+        protected int GetChildCount(ThreadIdentifier selectedThreadIdentifier, out int selected)
+        {
+            int count = 0;
+            int selectedCount = 0;
+
+            if (selectedThreadIdentifier.index == ThreadIdentifier.kAll)
+            {
+                if (selectedThreadIdentifier.name == "All")
+                {
+                    for (int index = 0; index < m_ThreadNames.Count; ++index)
+                    {
+                        var threadNameWithIndex = m_ThreadNames[index];
+                        var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+
+                        if (threadIdentifier.index != ThreadIdentifier.kAll)
+                        {
+                            count++;
+                            if (m_ThreadSelection.selection.Contains(threadNameWithIndex))
+                                selectedCount++;
+                        }
+                    }
+                }
+                else
+                {
+                    for (int index = 0; index < m_ThreadNames.Count; ++index)
+                    {
+                        var threadNameWithIndex = m_ThreadNames[index];
+                        var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+
+                        if (selectedThreadIdentifier.name == threadIdentifier.name &&
+                            threadIdentifier.index != ThreadIdentifier.kAll)
+                        {
+                            count++;
+                            if (m_ThreadSelection.selection.Contains(threadNameWithIndex))
+                                selectedCount++;
+                        }
+                    }
+                }
+            }
+
+            selected = selectedCount;
+            return count;
+        }
+
+        protected override TreeViewItem BuildRoot()
+        {
+            int idForHiddenRoot = -1;
+            int depthForHiddenRoot = -1;
+            ProfileTreeViewItem root = new ProfileTreeViewItem(idForHiddenRoot, depthForHiddenRoot, "root", null);
+
+            int depth = 0;
+
+            var top = new ThreadTreeViewItem(-1, depth, m_AllThreadIdentifier.name, m_AllThreadIdentifier);
+            root.AddChild(top);
+
+            var expandList = new List<int>() {-1};
+            string lastThreadName = "";
+            TreeViewItem node = root;
+
+            for (int index = 0; index < m_ThreadNames.Count; ++index)
+            {
+                var threadNameWithIndex = m_ThreadNames[index];
+                if (threadNameWithIndex == m_AllThreadIdentifier.threadNameWithIndex)
+                    continue;
+
+                var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                var item = new ThreadTreeViewItem(index, depth, m_ThreadUINames[index], threadIdentifier);
+
+                if (threadIdentifier.name != lastThreadName)
+                {
+                    // New threads at root
+                    node = top;
+                    depth = 0;
+                }
+
+                node.AddChild(item);
+
+
+                if (threadIdentifier.name != lastThreadName)
+                {
+                    // Extra instances hang of the parent
+                    lastThreadName = threadIdentifier.name;
+                    node = item;
+                    depth = 1;
+                }
+            }
+
+            SetExpanded(expandList);
+
+            SetupDepthsFromParentsAndChildren(root);
+
+            return root;
+        }
+
+        void BuildRowRecursive(IList<TreeViewItem> rows, TreeViewItem item)
+        {
+            //if (item.children == null)
+            //    return;
+
+            if (!IsExpanded(item.id))
+                return;
+
+            foreach (ThreadTreeViewItem subNode in item.children)
+            {
+                rows.Add(subNode);
+
+                if (subNode.children != null)
+                    BuildRowRecursive(rows, subNode);
+            }
+        }
+
+        void BuildAllRows(IList<TreeViewItem> rows, TreeViewItem rootItem)
+        {
+            rows.Clear();
+            if (rootItem == null)
+                return;
+
+            if (rootItem.children == null)
+                return;
+
+            foreach (ThreadTreeViewItem node in rootItem.children)
+            {
+                rows.Add(node);
+
+                if (node.children != null)
+                    BuildRowRecursive(rows, node);
+            }
+        }
+
+        protected override IList<TreeViewItem> BuildRows(TreeViewItem root)
+        {
+            BuildAllRows(m_Rows, root);
+
+            SortIfNeeded(m_Rows);
+
+            return m_Rows;
+        }
+
+        void OnSortingChanged(MultiColumnHeader _multiColumnHeader)
+        {
+            SortIfNeeded(GetRows());
+        }
+
+        void OnVisibleColumnsChanged(MultiColumnHeader _multiColumnHeader)
+        {
+            multiColumnHeader.ResizeToFit();
+        }
+
+        void SortIfNeeded(IList<TreeViewItem> rows)
+        {
+            if (rows.Count <= 1)
+            {
+                return;
+            }
+
+            if (multiColumnHeader.sortedColumnIndex == -1)
+            {
+                return; // No column to sort for (just use the order the data are in)
+            }
+
+            SortByMultipleColumns();
+
+            BuildAllRows(rows, rootItem);
+
+            Repaint();
+        }
+
+        string GetItemGroupName(ThreadTreeViewItem item)
+        {
+            string groupName;
+            string threadName = item.threadIdentifier.name;
+            threadName = ProfileData.GetThreadNameWithoutGroup(item.threadIdentifier.name, out groupName);
+
+            return groupName;
+        }
+
+        List<TreeViewItem> SortChildrenByMultipleColumns(List<TreeViewItem> children)
+        {
+            int[] sortedColumns = multiColumnHeader.state.sortedColumns;
+
+            if (sortedColumns.Length == 0)
+            {
+                return children;
+            }
+
+            var myTypes = children.Cast<ThreadTreeViewItem>();
+            var orderedQuery = InitialOrder(myTypes, sortedColumns);
+            for (int i = 0; i < sortedColumns.Length; i++)
+            {
+                SortOption sortOption = m_SortOptions[sortedColumns[i]];
+                bool ascending = multiColumnHeader.IsSortedAscending(sortedColumns[i]);
+
+                switch (sortOption)
+                {
+                    case SortOption.GroupName:
+                        orderedQuery = orderedQuery.ThenBy(l => GetItemGroupName(l), ascending);
+                        break;
+                    case SortOption.ThreadName:
+                        orderedQuery = orderedQuery.ThenBy(l => GetItemDisplayText(l), ascending);
+                        break;
+                    case SortOption.State:
+                        orderedQuery = orderedQuery.ThenBy(l => GetStateSort(l), ascending);
+                        break;
+                }
+            }
+
+            return orderedQuery.Cast<TreeViewItem>().ToList();
+        }
+
+        void SortByMultipleColumns()
+        {
+            rootItem.children = SortChildrenByMultipleColumns(rootItem.children);
+
+            // Sort all the next level children too (As 'All' is the only item at the top)
+            for (int i = 0; i < rootItem.children.Count; i++)
+            {
+                var child = rootItem.children[0];
+                child.children = SortChildrenByMultipleColumns(child.children);
+            }
+        }
+
+        IOrderedEnumerable<ThreadTreeViewItem> InitialOrder(IEnumerable<ThreadTreeViewItem> myTypes, int[] history)
+        {
+            SortOption sortOption = m_SortOptions[history[0]];
+            bool ascending = multiColumnHeader.IsSortedAscending(history[0]);
+            switch (sortOption)
+            {
+                case SortOption.GroupName:
+                    return myTypes.Order(l => GetItemGroupName(l), ascending);
+                case SortOption.ThreadName:
+                    return myTypes.Order(l => GetItemDisplayText(l), ascending);
+                case SortOption.State:
+                    return myTypes.Order(l => GetStateSort(l), ascending);
+                default:
+                    Assert.IsTrue(false, "Unhandled enum");
+                    break;
+            }
+
+            // default
+            return myTypes.Order(l => GetItemDisplayText(l), ascending);
+        }
+
+        protected override void RowGUI(RowGUIArgs args)
+        {
+            ThreadTreeViewItem item = (ThreadTreeViewItem)args.item;
+
+            for (int i = 0; i < args.GetNumVisibleColumns(); ++i)
+            {
+                CellGUI(args.GetCellRect(i), item, (MyColumns)args.GetColumn(i), ref args);
+            }
+        }
+
+        string GetStateSort(ThreadTreeViewItem item)
+        {
+            ThreadSelected threadSelected = GetThreadSelectedState(item.threadIdentifier);
+
+            string sortString = ((int)threadSelected).ToString() + GetItemDisplayText(item);
+
+            return sortString;
+        }
+
+        ThreadSelected GetThreadSelectedState(ThreadIdentifier selectedThreadIdentifier)
+        {
+            if (ProfileAnalyzer.MatchThreadFilter(selectedThreadIdentifier.threadNameWithIndex, m_ThreadSelection.selection))
+                return ThreadSelected.Selected;
+
+            // If querying the 'All' filter then check if all selected
+            if (selectedThreadIdentifier.threadNameWithIndex == m_AllThreadIdentifier.threadNameWithIndex)
+            {
+                // Check all threads without All in the name are selected
+                int count = 0;
+                int selectedCount = 0;
+                foreach (var threadNameWithIndex in m_ThreadNames)
+                {
+                    var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                    if (threadIdentifier.index == ThreadIdentifier.kAll || threadIdentifier.index == ThreadIdentifier.kSingle)
+                        continue;
+
+                    if (m_ThreadSelection.selection.Contains(threadNameWithIndex))
+                        selectedCount++;
+
+                    count++;
+                }
+
+                if (selectedCount == count)
+                    return ThreadSelected.Selected;
+
+                if (selectedCount > 0)
+                    return ThreadSelected.Partial;
+
+                return ThreadSelected.NotSelected;
+            }
+
+            // Need to check 'All' and thread group All.
+            if (selectedThreadIdentifier.index == ThreadIdentifier.kAll)
+            {
+                // Count all threads that match this thread group
+                int count = 0;
+                foreach (var threadNameWithIndex in m_ThreadNames)
+                {
+                    var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                    if (threadIdentifier.index == ThreadIdentifier.kAll || threadIdentifier.index == ThreadIdentifier.kSingle)
+                        continue;
+
+                    if (selectedThreadIdentifier.name != threadIdentifier.name)
+                        continue;
+
+                    count++;
+                }
+
+                // Count all the threads we have selected that match this thread group
+                int selectedCount = 0;
+                foreach (var threadNameWithIndex in m_ThreadSelection.selection)
+                {
+                    var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                    if (selectedThreadIdentifier.name != threadIdentifier.name)
+                        continue;
+                    if (threadIdentifier.index > count)
+                        continue;
+
+                    selectedCount++;
+                }
+
+                if (selectedCount == count)
+                    return ThreadSelected.Selected;
+
+                if (selectedCount > 0)
+                    return ThreadSelected.Partial;
+            }
+
+            return ThreadSelected.NotSelected;
+        }
+
+        string GetItemDisplayText(ThreadTreeViewItem item)
+        {
+            int selectedChildren;
+            int childCount = GetChildCount(item.threadIdentifier, out selectedChildren);
+
+            string fullThreadName = item.threadIdentifier.name;
+            string groupName;
+            string threadName = ProfileData.GetThreadNameWithoutGroup(fullThreadName, out groupName);
+
+            string displayThreadName = multiColumnHeader.IsColumnVisible((int)MyColumns.GroupName) ? threadName : fullThreadName;
+
+            string text;
+            if (childCount <= 1)
+            {
+                text = item.displayName;
+            }
+            else if (selectedChildren != childCount)
+            {
+                text = string.Format("{0} ({1} of {2})", displayThreadName, selectedChildren, childCount);
+            }
+            else
+            {
+                text = string.Format("{0} (All)", displayThreadName);
+            }
+
+            return text;
+        }
+
+        void GetThreadTreeViewItemInfo(ThreadTreeViewItem item, out string text, out string tooltip)
+        {
+            text = GetItemDisplayText(item);
+            int selectedChildren;
+            int childCount = GetChildCount(item.threadIdentifier, out selectedChildren);
+
+            string groupName = GetItemGroupName(item);
+
+            if (childCount <= 1)
+            {
+                tooltip = (groupName == "") ? text : string.Format("{0}\n{1}", text, groupName);
+            }
+            else if (selectedChildren != childCount)
+            {
+                tooltip = (groupName == "") ? text : string.Format("{0}\n{1}", text, groupName);
+            }
+            else
+            {
+                tooltip = (groupName == "") ? text : string.Format("{0}\n{1}", text, groupName);
+            }
+        }
+
+        Rect DrawIndent(Rect rect, ThreadTreeViewItem item, ref RowGUIArgs args)
+        {
+            // The rect is assumed indented and sized after the content when pinging
+            float indent = GetContentIndent(item) + extraSpaceBeforeIconAndLabel;
+            rect.xMin += indent;
+
+            int iconRectWidth = 16;
+            int kSpaceBetweenIconAndText = 2;
+
+            // Draw icon
+            Rect iconRect = rect;
+            iconRect.width = iconRectWidth;
+            // iconRect.x += 7f;
+
+            Texture icon = args.item.icon;
+            if (icon != null)
+                GUI.DrawTexture(iconRect, icon, ScaleMode.ScaleToFit);
+
+            rect.xMin += icon == null ? 0 : iconRectWidth + kSpaceBetweenIconAndText;
+
+            return rect;
+        }
+
+        void CellGUI(Rect cellRect, ThreadTreeViewItem item, MyColumns column, ref RowGUIArgs args)
+        {
+            // Center cell rect vertically (makes it easier to place controls, icons etc in the cells)
+            CenterRectUsingSingleLineHeight(ref cellRect);
+
+            switch (column)
+            {
+                case MyColumns.ThreadName:
+                {
+                    args.rowRect = cellRect;
+                    // base.RowGUI(args);    // Required to show tree indenting
+
+                    // Draw manually to keep indenting while add a tooltip
+                    Rect rect = cellRect;
+                    if (Event.current.rawType == EventType.Repaint)
+                    {
+                        string text;
+                        string tooltip;
+                        GetThreadTreeViewItemInfo(item, out text, out tooltip);
+                        var content = new GUIContent(text, tooltip);
+
+                        if (activeLineStyle == null)
+                        {
+                            // activeLineStyle = DefaultStyles.boldLabel;
+                            activeLineStyle = new GUIStyle(DefaultStyles.label);
+                            activeLineStyle.normal.textColor = DefaultStyles.boldLabel.onActive.textColor;
+                        }
+
+                        // rect = DrawIndent(rect, item, ref args);
+
+                        //bool mouseOver = rect.Contains(Event.current.mousePosition);
+                        //DefaultStyles.label.Draw(rect, content, mouseOver, false, args.selected, args.focused);
+
+                        // Must use this call to draw tooltip
+                        EditorGUI.LabelField(rect, content, args.selected ? activeLineStyle : DefaultStyles.label);
+                    }
+                }
+                break;
+                case MyColumns.GroupName:
+                {
+                    Rect rect = cellRect;
+                    if (Event.current.rawType == EventType.Repaint)
+                    {
+                        rect = DrawIndent(rect, item, ref args);
+
+                        string groupName = GetItemGroupName(item);
+                        var content = new GUIContent(groupName, groupName);
+                        EditorGUI.LabelField(rect, content);
+                    }
+                }
+                break;
+                case MyColumns.State:
+                    bool oldState = GetThreadSelectedState(item.threadIdentifier) == ThreadSelected.Selected;
+                    bool newState = EditorGUI.Toggle(cellRect, oldState);
+                    if (newState != oldState)
+                    {
+                        if (item.threadIdentifier.threadNameWithIndex == m_AllThreadIdentifier.threadNameWithIndex)
+                        {
+                            // Record active groups
+                            m_ThreadSelection.groups.Clear();
+                            if (newState)
+                            {
+                                if (!m_ThreadSelection.groups.Contains(item.threadIdentifier.threadNameWithIndex))
+                                    m_ThreadSelection.groups.Add(item.threadIdentifier.threadNameWithIndex);
+                            }
+
+                            // Update selection
+                            m_ThreadSelection.selection.Clear();
+                            if (newState)
+                            {
+                                foreach (string threadNameWithIndex in m_ThreadNames)
+                                {
+                                    if (threadNameWithIndex != m_AllThreadIdentifier.threadNameWithIndex)
+                                    {
+                                        var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                                        if (threadIdentifier.index != ThreadIdentifier.kAll)
+                                        {
+                                            m_ThreadSelection.selection.Add(threadNameWithIndex);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        else if (item.threadIdentifier.index == ThreadIdentifier.kAll)
+                        {
+                            // Record active groups
+                            if (newState)
+                            {
+                                if (!m_ThreadSelection.groups.Contains(item.threadIdentifier.threadNameWithIndex))
+                                    m_ThreadSelection.groups.Add(item.threadIdentifier.threadNameWithIndex);
+                            }
+                            else
+                            {
+                                m_ThreadSelection.groups.Remove(item.threadIdentifier.threadNameWithIndex);
+                                // When turning off a sub group, turn of the 'all' group too
+                                m_ThreadSelection.groups.Remove(m_AllThreadIdentifier.threadNameWithIndex);
+                            }
+
+                            // Update selection
+                            if (newState)
+                            {
+                                foreach (string threadNameWithIndex in m_ThreadNames)
+                                {
+                                    var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                                    if (threadIdentifier.name == item.threadIdentifier.name &&
+                                        threadIdentifier.index != ThreadIdentifier.kAll)
+                                    {
+                                        if (!m_ThreadSelection.selection.Contains(threadNameWithIndex))
+                                            m_ThreadSelection.selection.Add(threadNameWithIndex);
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                var removeSelection = new List<string>();
+                                foreach (string threadNameWithIndex in m_ThreadSelection.selection)
+                                {
+                                    var threadIdentifier = new ThreadIdentifier(threadNameWithIndex);
+                                    if (threadIdentifier.name == item.threadIdentifier.name &&
+                                        threadIdentifier.index != ThreadIdentifier.kAll)
+                                    {
+                                        removeSelection.Add(threadNameWithIndex);
+                                    }
+                                }
+                                foreach (string threadNameWithIndex in removeSelection)
+                                {
+                                    m_ThreadSelection.selection.Remove(threadNameWithIndex);
+                                }
+                            }
+                        }
+                        else
+                        {
+                            if (newState)
+                            {
+                                m_ThreadSelection.selection.Add(item.threadIdentifier.threadNameWithIndex);
+                            }
+                            else
+                            {
+                                m_ThreadSelection.selection.Remove(item.threadIdentifier.threadNameWithIndex);
+
+                                // Turn off any group its in too
+                                var groupIdentifier = new ThreadIdentifier(item.threadIdentifier);
+                                groupIdentifier.SetAll();
+                                m_ThreadSelection.groups.Remove(groupIdentifier.threadNameWithIndex);
+
+                                // Turn of the 'all' group too
+                                m_ThreadSelection.groups.Remove(m_AllThreadIdentifier.threadNameWithIndex);
+                            }
+                        }
+
+                        StateChanged = true;
+
+                        // Re-sort
+                        SortIfNeeded(GetRows());
+                    }
+                    break;
+            }
+        }
+
+        // Misc
+        //--------
+
+        protected override bool CanMultiSelect(TreeViewItem item)
+        {
+            return false;
+        }
+
+        struct HeaderData
+        {
+            public GUIContent content;
+            public float width;
+            public float minWidth;
+            public bool autoResize;
+            public bool allowToggleVisibility;
+
+            public HeaderData(string name, string tooltip = "", float _width = 50, float _minWidth = 30, bool _autoResize = true, bool _allowToggleVisibility = true)
+            {
+                content = new GUIContent(name, tooltip);
+                width = _width;
+                minWidth = _minWidth;
+                autoResize = _autoResize;
+                allowToggleVisibility = _allowToggleVisibility;
+            }
+        }
+
+        public static MultiColumnHeaderState CreateDefaultMultiColumnHeaderState(float treeViewWidth)
+        {
+            var columnList = new List<MultiColumnHeaderState.Column>();
+            HeaderData[] headerData = new HeaderData[]
+            {
+                new HeaderData("Group", "Thread Group", 200, 100, true, false),
+                new HeaderData("Thread", "Thread Name", 350, 100, true, false),
+                new HeaderData("Show", "Check to show this thread in the analysis views", 40, 100, false, false),
+            };
+            foreach (var header in headerData)
+            {
+                columnList.Add(new MultiColumnHeaderState.Column
+                {
+                    headerContent = header.content,
+                    headerTextAlignment = TextAlignment.Left,
+                    sortedAscending = true,
+                    sortingArrowAlignment = TextAlignment.Left,
+                    width = header.width,
+                    minWidth = header.minWidth,
+                    autoResize = header.autoResize,
+                    allowToggleVisibility = header.allowToggleVisibility
+                });
+            }
+            ;
+            var columns = columnList.ToArray();
+
+            Assert.AreEqual(columns.Length, Enum.GetValues(typeof(MyColumns)).Length, "Number of columns should match number of enum values: You probably forgot to update one of them.");
+
+            var state = new MultiColumnHeaderState(columns);
+            state.visibleColumns = new int[]
+            {
+                (int)MyColumns.GroupName,
+                (int)MyColumns.ThreadName,
+                (int)MyColumns.State,
+            };
+            return state;
+        }
+
+        protected override void SelectionChanged(IList<int> selectedIds)
+        {
+            base.SelectionChanged(selectedIds);
+
+            if (selectedIds.Count > 0)
+            {
+            }
+        }
+    }
+
+    internal class ThreadSelectionWindow : EditorWindow
+    {
+        private static HashSet<ThreadSelectionWindow> s_Instances = new HashSet<ThreadSelectionWindow>();
+        ProfileAnalyzerWindow m_ProfileAnalyzerWindow;
+        TreeViewState m_ThreadTreeViewState;
+        //Static to store state between open/close
+        static MultiColumnHeaderState m_ThreadMulticolumnHeaderState;
+        ThreadTable m_ThreadTable;
+
+        List<string> m_ThreadNames;
+        List<string> m_ThreadUINames;
+        ThreadSelection m_OriginalThreadSelection;
+        bool m_EnableApplyButton = false;
+        bool m_EnableResetButton = false;
+        bool m_RequestClose;
+
+        internal static class Styles
+        {
+            public static readonly GUIContent reset = new GUIContent("Reset", "Reset selection to previous set");
+            public static readonly GUIContent clear = new GUIContent("Clear", "Clear selection below");
+            public static readonly GUIContent main = new GUIContent("Main Only", "Select Main Thread only");
+            public static readonly GUIContent common = new GUIContent("Common Set", "Select Common threads : Main, Render and Jobs");
+            public static readonly GUIContent apply = new GUIContent("Apply", "");
+        }
+
+        static public bool IsOpen()
+        {
+            return s_Instances.Count > 0;
+        }
+
+        static public ThreadSelectionWindow Open(float screenX, float screenY, ProfileAnalyzerWindow profileAnalyzerWindow, ThreadSelection threadSelection, List<string> threadNames, List<string> threadUINames)
+        {
+            ThreadSelectionWindow window = GetWindow<ThreadSelectionWindow>(true, "Threads");
+            window.minSize = new Vector2(380, 200);
+            window.position = new Rect(screenX, screenY, 500, 500);
+            window.SetData(profileAnalyzerWindow, threadSelection, threadNames, threadUINames);
+            window.Show();
+
+            return window;
+        }
+
+        void OnEnable()
+        {
+            m_RequestClose = false;
+            s_Instances.Add(this);
+        }
+
+        private void OnDisable()
+        {
+            s_Instances.Remove(this);
+        }
+
+        void CreateTable(ProfileAnalyzerWindow profileAnalyzerWindow, List<string> threadNames, List<string> threadUINames, ThreadSelection threadSelection)
+        {
+            if (m_ThreadTreeViewState == null)
+                m_ThreadTreeViewState = new TreeViewState();
+
+            int sortedColumn;
+            bool sortAscending;
+            if (m_ThreadMulticolumnHeaderState == null)
+            {
+                m_ThreadMulticolumnHeaderState = ThreadTable.CreateDefaultMultiColumnHeaderState(700);
+                sortedColumn = (int)ThreadTable.MyColumns.GroupName;
+                sortAscending = true;
+            }
+            else
+            {
+                // Remember last sort key
+                sortedColumn = m_ThreadMulticolumnHeaderState.sortedColumnIndex;
+                sortAscending = m_ThreadMulticolumnHeaderState.columns[sortedColumn].sortedAscending;
+            }
+
+            var multiColumnHeader = new MultiColumnHeader(m_ThreadMulticolumnHeaderState);
+            multiColumnHeader.SetSorting(sortedColumn, sortAscending);
+            multiColumnHeader.ResizeToFit();
+            m_ThreadTable = new ThreadTable(m_ThreadTreeViewState, multiColumnHeader, threadNames, threadUINames, threadSelection);
+        }
+
+        void SetData(ProfileAnalyzerWindow profileAnalyzerWindow, ThreadSelection threadSelection, List<string> threadNames, List<string> threadUINames)
+        {
+            m_ProfileAnalyzerWindow = profileAnalyzerWindow;
+            m_OriginalThreadSelection = threadSelection;
+            m_ThreadNames = threadNames;
+            m_ThreadUINames = threadUINames;
+            CreateTable(profileAnalyzerWindow, threadNames, threadUINames, threadSelection);
+        }
+
+        void OnDestroy()
+        {
+            // By design we now no longer apply the thread settings when closing the dialog.
+            // Apply must be clicked to set them.
+            // m_ProfileAnalyzerWindow.SetThreadSelection(m_ThreadTable.GetThreadSelection());
+        }
+
+        void OnGUI()
+        {
+            EditorGUILayout.BeginVertical(GUILayout.ExpandWidth(true));
+            GUIStyle style = new GUIStyle(GUI.skin.label);
+            style.alignment = TextAnchor.MiddleLeft;
+            GUILayout.Label("Select Thread : ", style);
+
+            EditorGUILayout.BeginHorizontal();
+            bool lastEnabled = GUI.enabled;
+
+            GUI.enabled = m_EnableResetButton;
+            if (GUILayout.Button(Styles.reset, GUILayout.Width(50)))
+            {
+                // Reset the thread window contents only
+                CreateTable(m_ProfileAnalyzerWindow, m_ThreadNames, m_ThreadUINames, m_OriginalThreadSelection);
+                m_EnableApplyButton = true;
+                m_EnableResetButton = false;
+            }
+            GUI.enabled = lastEnabled;
+
+            if (GUILayout.Button(Styles.clear, GUILayout.Width(50)))
+            {
+                m_ThreadTable.ClearThreadSelection();
+            }
+
+            if (GUILayout.Button(Styles.main, GUILayout.Width(100)))
+            {
+                m_ThreadTable.SelectMain();
+            }
+
+            if (GUILayout.Button(Styles.common, GUILayout.Width(100)))
+            {
+                m_ThreadTable.SelectCommon();
+            }
+
+            GUI.enabled = m_EnableApplyButton && !m_ProfileAnalyzerWindow.IsAnalysisRunning();
+
+            EditorGUILayout.Space();
+
+            if (GUILayout.Button(Styles.apply, GUILayout.Width(50)))
+            {
+                m_ProfileAnalyzerWindow.SetThreadSelection(m_ThreadTable.GetThreadSelection());
+                m_EnableApplyButton = false;
+                m_EnableResetButton = true;
+            }
+            GUI.enabled = lastEnabled;
+
+            EditorGUILayout.EndHorizontal();
+
+            if (m_ThreadTable != null)
+            {
+                Rect r = EditorGUILayout.GetControlRect(GUILayout.ExpandHeight(true));
+                m_ThreadTable.OnGUI(r);
+            }
+
+            EditorGUILayout.EndVertical();
+        }
+
+        void Update()
+        {
+            if (m_ThreadTable != null && m_ThreadTable.StateChanged)
+            {
+                m_EnableApplyButton = true;
+                m_EnableResetButton = true;
+            }
+
+            if (m_RequestClose)
+                Close();
+        }
+
+        void OnLostFocus()
+        {
+            m_RequestClose = true;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelectionWindow.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelectionWindow.cs.meta
new file mode 100644
index 0000000..0dc2147
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/ThreadSelectionWindow.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b643b14ae5b894e10b5d393e31f5c347
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TimingOptions.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TimingOptions.cs
new file mode 100644
index 0000000..99f0c70
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TimingOptions.cs
@@ -0,0 +1,19 @@
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class TimingOptions
+    {
+        public enum TimingOption
+        {
+            Time,
+            Self,
+        };
+
+        public static string[] TimingOptionNames =
+        {
+            "Total",
+            "Self",
+        };
+
+        public static string Tooltip = "Marker timings :\n\nTotal : \tIncluding children\nSelf : \tExcluding children";
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TimingOptions.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TimingOptions.cs.meta
new file mode 100644
index 0000000..cd42cea
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TimingOptions.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 60eefcdcc882eb14f933f363fc2faef6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkerList.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkerList.cs
new file mode 100644
index 0000000..119d06d
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkerList.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class TopMarkerList
+    {
+        internal static class Styles
+        {
+            public static readonly GUIContent frameCosts = new GUIContent(" by frame costs", "Contains accumulated marker cost within the frame");
+            public static readonly GUIContent frameCounts = new GUIContent(" by frame counts", "Contains marker count within the frame");
+        }
+
+        public delegate float DrawFrameIndexButton(int frameIndex, ProfileDataView frameContext);
+
+        DrawFrameIndexButton m_DrawFrameIndexButton;
+        Draw2D m_2D;
+        DisplayUnits m_Units;
+        int m_WidthColumn0;
+        int m_WidthColumn1;
+        int m_WidthColumn2;
+        int m_WidthColumn3;
+        Color colorBar;
+        Color colorBarBackground;
+
+        public TopMarkerList(Draw2D draw2D, Units units,
+                             int widthColumn0, int widthColumn1, int widthColumn2, int widthColumn3,
+                             Color colorBar, Color colorBarBackground, DrawFrameIndexButton drawFrameIndexButton)
+        {
+            m_2D = draw2D;
+            SetUnits(units);
+            m_WidthColumn0 = widthColumn0;
+            m_WidthColumn1 = widthColumn1;
+            m_WidthColumn2 = widthColumn2;
+            m_WidthColumn3 = widthColumn3;
+            this.colorBar = colorBar;
+            this.colorBarBackground = colorBarBackground;
+            m_DrawFrameIndexButton = drawFrameIndexButton;
+        }
+
+        void SetUnits(Units units)
+        {
+            m_Units = new DisplayUnits(units);
+        }
+
+        public int DrawTopNumber(int topNumber, string[] topStrings, int[] topValues)
+        {
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField("Top ", GUILayout.Width(30));
+            topNumber = EditorGUILayout.IntPopup(topNumber, topStrings, topValues, GUILayout.Width(40));
+            EditorGUILayout.LabelField(m_Units.Units == Units.Count ? Styles.frameCounts : Styles.frameCosts, GUILayout.Width(100));
+            EditorGUILayout.EndHorizontal();
+
+            return topNumber;
+        }
+
+        public List<FrameTime> GetTopNByCount(MarkerData marker, int n)
+        {
+            if (marker.frames.Count <= 0)
+                return new List<FrameTime>();
+
+            List<FrameTime> sortedFrames = new List<FrameTime>(marker.frames);
+            sortedFrames.Sort(FrameTime.CompareCountDescending);
+
+            var frameTimes = new List<FrameTime>();
+            for (int i = 0; i < Math.Min(n, sortedFrames.Count); i++)
+                frameTimes.Add(sortedFrames[i]);
+
+            return frameTimes;
+        }
+
+        public List<FrameTime> GetTopNByTime(MarkerData marker, int n)
+        {
+            if (marker.frames.Count <= 0)
+                return new List<FrameTime>();
+
+            List<FrameTime> sortedFrames = new List<FrameTime>(marker.frames);
+            sortedFrames.Sort(FrameTime.CompareMsDescending);
+
+            var frameTimes = new List<FrameTime>();
+            for (int i = 0; i < Math.Min(n, sortedFrames.Count); i++)
+                frameTimes.Add(sortedFrames[i]);
+
+            return frameTimes;
+        }
+
+        public List<FrameTime> GetTopN(MarkerData marker, int n, bool showCount)
+        {
+            return showCount ? GetTopNByCount(marker, n) : GetTopNByTime(marker, n);
+        }
+
+        public int Draw(MarkerData marker, ProfileDataView markerContext, int topNumber, string[] topStrings, int[] topValues)
+        {
+            GUIStyle style = GUI.skin.label;
+            float w = m_WidthColumn0;
+            float h = style.lineHeight;
+            float ySpacing = 2;
+            float barHeight = h - ySpacing;
+
+            EditorGUILayout.BeginVertical(GUILayout.Width(w + m_WidthColumn1 + m_WidthColumn2 + m_WidthColumn3));
+
+            topNumber = DrawTopNumber(topNumber, topStrings, topValues);
+
+            /*
+            EditorGUILayout.BeginHorizontal();
+            EditorGUILayout.LabelField("", GUILayout.Width(w));
+            EditorGUILayout.LabelField("Value", GUILayout.Width(LayoutSize.WidthColumn1));
+            EditorGUILayout.LabelField("Frame", GUILayout.Width(LayoutSize.WidthColumn2));
+            EditorGUILayout.EndHorizontal();
+            */
+
+            // var frameSummary = m_ProfileSingleView.analysis.GetFrameSummary();
+            float barMax = marker.msMax; // frameSummary.msMax
+            if (m_Units.Units == Units.Count)
+            {
+                barMax = marker.countMax;
+            }
+
+            // Marker frames are ordered by frame time
+            // If we are sorting by count then we need to apply a sort
+            bool showCount = m_Units.Units == Units.Count;
+            List<FrameTime> frames = GetTopN(marker, topNumber, showCount);
+
+            foreach (FrameTime frameTime in frames)
+            {
+                float barValue = (m_Units.Units == Units.Count) ? frameTime.count : frameTime.ms;
+                float barLength = Math.Min((w * barValue) / barMax, w);
+
+                EditorGUILayout.BeginHorizontal();
+                if (m_2D.DrawStart(w, h, Draw2D.Origin.TopLeft, style))
+                {
+                    m_2D.DrawFilledBox(0, ySpacing, barLength, barHeight, colorBar);
+                    m_2D.DrawFilledBox(barLength, ySpacing, w - barLength, barHeight, colorBarBackground);
+                    m_2D.DrawEnd();
+
+                    Rect rect = GUILayoutUtility.GetLastRect();
+                    GUI.Label(rect, new GUIContent("", m_Units.ToTooltipString(barValue, true)));
+                }
+                EditorGUILayout.LabelField(m_Units.ToGUIContentWithTooltips(barValue, true), GUILayout.Width(m_WidthColumn2));
+                if (m_DrawFrameIndexButton != null)
+                    m_DrawFrameIndexButton(frameTime.frameIndex, markerContext);
+                GUILayout.FlexibleSpace();
+                EditorGUILayout.EndHorizontal();
+            }
+
+            // Show blank space for missing frames
+            var content = new GUIContent("", "");
+            Vector2 size = GUI.skin.button.CalcSize(content);
+            h = Math.Max(barHeight, size.y);
+            for (int i = frames.Count; i < topNumber; i++)
+            {
+                EditorGUILayout.BeginHorizontal();
+                GUILayout.Label("", GUILayout.Height(h));
+                EditorGUILayout.EndHorizontal();
+            }
+
+            EditorGUILayout.EndVertical();
+
+            return topNumber;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkerList.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkerList.cs.meta
new file mode 100644
index 0000000..613d2c3
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkerList.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4e7e7da63135a4cda9b821c5d96c7b4a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkers.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkers.cs
new file mode 100644
index 0000000..843b1ea
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkers.cs
@@ -0,0 +1,896 @@
+using System;
+using System.Text;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Profiling;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    internal class TopMarkers
+    {
+        internal class RangeSettings
+        {
+            public readonly ProfileDataView dataView;
+
+            public readonly int depthFilter;
+            public readonly List<string> nameFilters;
+            public readonly List<string> nameExcludes;
+            public readonly TimingOptions.TimingOption timingOption;
+            public readonly int threadSelectionCount;
+            public readonly bool hideRemovedMarkers;
+
+            public RangeSettings(ProfileDataView dataView, int depthFilter, List<string> nameFilters, List<string> nameExcludes, TimingOptions.TimingOption timingOption, int threadSelectionCount, bool hideRemovedMarkers)
+            {
+                // Make a copy rather than keeping a reference
+                this.dataView = dataView==null ? new ProfileDataView() : new ProfileDataView(dataView);
+                this.depthFilter = depthFilter;
+                this.nameFilters = nameFilters;
+                this.nameExcludes = nameExcludes;
+                this.timingOption = timingOption;
+                this.threadSelectionCount = threadSelectionCount;
+                this.hideRemovedMarkers = hideRemovedMarkers;
+            }
+
+            public override int GetHashCode()
+            {
+                int hash = 13;
+                hash = (hash * 7) + dataView.GetHashCode();
+                hash = (hash * 7) + depthFilter.GetHashCode();
+                hash = (hash * 7) + nameFilters.GetHashCode();
+                hash = (hash * 7) + nameExcludes.GetHashCode();
+                hash = (hash * 7) + timingOption.GetHashCode();
+                hash = (hash * 7) + threadSelectionCount.GetHashCode();
+                hash = (hash * 7) + hideRemovedMarkers.GetHashCode();
+
+                return hash;
+            }
+
+            public override bool Equals(object b)
+            {
+                if (System.Object.ReferenceEquals(null, b))
+                {
+                    return false;
+                }
+
+                if (System.Object.ReferenceEquals(this, b))
+                {
+                    return true;
+                }
+
+                if (b.GetType() != this.GetType())
+                {
+                    return false;
+                }
+
+                return IsEqual((RangeSettings)b);
+            }
+
+            bool IsEqual(RangeSettings b)
+            {
+                if (timingOption != b.timingOption)
+                    return false;
+
+                if (b.dataView == null && dataView != null)
+                    return false;
+
+                // Check contents of data view (the reference will definitly not match as we made a copy)
+                if (b.dataView != null)
+                {
+                    // Only need to check data, analysis and selectedIndices
+                    if (dataView.data != b.dataView.data)
+                        return false;
+                    if (dataView.analysis != b.dataView.analysis)
+                        return false;
+
+                    if (dataView.selectedIndices.Count != b.dataView.selectedIndices.Count)
+                        return false;
+
+                    // Want to check if contents match, not just if reference is the same
+                    for (int i = 0; i < dataView.selectedIndices.Count; i++)
+                    {
+                        if (dataView.selectedIndices[i] != b.dataView.selectedIndices[i])
+                            return false;
+                    }
+                }
+
+                if (depthFilter != b.depthFilter)
+                    return false;
+                if (threadSelectionCount != b.threadSelectionCount)
+                    return false;
+
+                if (hideRemovedMarkers != b.hideRemovedMarkers)
+                    return false;
+
+                if (nameFilters.Count != b.nameFilters.Count)
+                    return false;
+                if (nameExcludes.Count != b.nameExcludes.Count)
+                    return false;
+
+                // Want to check if contents match, not just if reference is the same
+                for (int i = 0; i < nameFilters.Count; i++)
+                {
+                    if (nameFilters[i] != b.nameFilters[i])
+                        return false;
+                }
+                for (int i = 0; i < nameExcludes.Count; i++)
+                {
+                    if (nameExcludes[i] != b.nameExcludes[i])
+                        return false;
+                }
+
+                return true;
+            }
+
+            public static bool operator==(RangeSettings a, RangeSettings b)
+            {
+                // If both are null, or both are same instance, return true.
+                if (System.Object.ReferenceEquals(a, b))
+                {
+                    return true;
+                }
+
+                // If one is null, but not both, return false.
+                if (((object)a == null) || ((object)b == null))
+                {
+                    return false;
+                }
+
+                return a.IsEqual(b);
+            }
+
+            public static bool operator!=(RangeSettings a, RangeSettings b)
+            {
+                return !(a == b);
+            }
+        }
+
+        internal class Settings
+        {   
+            public readonly int barCount;
+            public readonly float timeRange;
+
+            public readonly bool includeOthers;
+            public readonly bool includeUnaccounted;
+
+            public RangeSettings rangeSettings { get ; private set ; }
+
+            public Settings(RangeSettings rangeSettings, int barCount, float timeRange, bool includeOthers, bool includeUnaccounted)
+            {
+                this.rangeSettings = rangeSettings;
+                this.barCount = barCount;
+                this.timeRange = timeRange;
+                this.includeOthers = includeOthers;
+                this.includeUnaccounted = includeUnaccounted;
+            }
+
+            public override int GetHashCode()
+            {
+                int hash = 13;
+                hash = (hash * 7) + rangeSettings.GetHashCode();
+                hash = (hash * 7) + barCount.GetHashCode();
+                hash = (hash * 7) + timeRange.GetHashCode();
+                hash = (hash * 7) + includeOthers.GetHashCode();
+                hash = (hash * 7) + includeUnaccounted.GetHashCode();
+
+                return hash;
+            }
+
+            public override bool Equals(object b)
+            {
+                if (System.Object.ReferenceEquals(null, b))
+                {
+                    return false;
+                }
+
+                if (System.Object.ReferenceEquals(this, b))
+                {
+                    return true;
+                }
+
+                if (b.GetType() != this.GetType())
+                {
+                    return false;
+                }
+
+                return IsEqual((Settings)b);
+            }
+
+            bool IsEqual(Settings b)
+            {
+                if (rangeSettings != b.rangeSettings)
+                    return false;
+                if (barCount != b.barCount)
+                    return false;
+                if (timeRange != b.timeRange)
+                    return false;
+                if (includeOthers != b.includeOthers)
+                    return false;
+                if (includeUnaccounted != b.includeUnaccounted)
+                    return false;
+
+                return true;
+            }
+
+            public static bool operator==(Settings a, Settings b)
+            {
+                // If both are null, or both are same instance, return true.
+                if (System.Object.ReferenceEquals(a, b))
+                {
+                    return true;
+                }
+
+                // If one is null, but not both, return false.
+                if (((object)a == null) || ((object)b == null))
+                {
+                    return false;
+                }
+
+                return a.IsEqual(b);
+            }
+
+            public static bool operator!=(Settings a, Settings b)
+            {
+                return !(a == b);
+            }
+        }
+
+        internal enum SummaryType
+        {
+            Marker,
+            Other,
+            Unaccounted
+        }
+
+        internal struct MarkerSummaryEntry
+        {
+            public readonly string name;
+            public readonly float msAtMedian;   // At the median frame (Miliseconds)
+            public readonly float msMedian;     // median value for marker over all frames (Miliseconds) on frame medianFrameIndex
+            public readonly float x;
+            public readonly float w;
+            public readonly int medianFrameIndex;
+            public readonly SummaryType summaryType;
+
+            public MarkerSummaryEntry(string name, float msAtMedian, float msMedian, float x, float w, int medianFrameIndex, SummaryType summaryType)
+            {
+                this.name = name;
+                this.msAtMedian = msAtMedian;
+                this.msMedian = msMedian;
+                this.x = x;
+                this.w = w;
+                this.medianFrameIndex = medianFrameIndex;
+                this.summaryType = summaryType;
+            }
+        }
+
+        internal class MarkerSummary
+        {
+            public List<MarkerSummaryEntry> entry;
+
+            public float totalTime;
+
+            public MarkerSummary()
+            {
+                entry = new List<MarkerSummaryEntry>();
+                totalTime = 0f;
+            }
+        }
+
+        Settings m_CurrentSettings;             // Current settings, including latest RangeSettings
+        RangeSettings m_RequestedRangeSettings; // Next requested range setting set by SetData
+
+        float m_TimeRange;
+        bool m_TimeRangeDirty;                  // Set when renquested range settings change
+        MarkerSummary m_MarkerSummary;
+
+        internal static class Styles
+        {
+            public static readonly GUIContent menuItemSelectFramesInAll = new GUIContent("Select Frames that contain this marker (within whole data set)", "");
+            public static readonly GUIContent menuItemSelectFramesInCurrent = new GUIContent("Select Frames that contain this marker (within current selection)", "");
+            //public static readonly GUIContent menuItemClearSelection = new GUIContent("Clear Selection");
+            public static readonly GUIContent menuItemSelectFramesAll = new GUIContent("Select All");
+            public static readonly GUIContent menuItemAddToIncludeFilter = new GUIContent("Add to Include Filter", "");
+            public static readonly GUIContent menuItemAddToExcludeFilter = new GUIContent("Add to Exclude Filter", "");
+            public static readonly GUIContent menuItemRemoveFromIncludeFilter = new GUIContent("Remove from Include Filter", "");
+            public static readonly GUIContent menuItemRemoveFromExcludeFilter = new GUIContent("Remove from Exclude Filter", "");
+            public static readonly GUIContent menuItemSetAsParentMarkerFilter = new GUIContent("Set as Parent Marker Filter", "");
+            public static readonly GUIContent menuItemClearParentMarkerFilter = new GUIContent("Clear Parent Marker Filter", "");
+            public static readonly GUIContent menuItemSetAsRemoveMarker = new GUIContent("Remove Marker", "");
+            public static readonly GUIContent menuItemCopyToClipboard = new GUIContent("Copy to Clipboard", "");
+        }
+
+        private static class Content
+        {
+            public static readonly string frameTime = L10n.Tr("{0} Frame time on median frame");
+            public static readonly string multipleThreads = L10n.Tr("Multiple threads selected\nSelect a single thread for an overview");
+            public static readonly string totalTimeAllDepths = L10n.Tr("{0} Total time of all markers at all depths");
+            public static readonly string totalTimeAtSpecificDepth = L10n.Tr("{0} Total time of all markers at Depth {1}");
+            public static readonly string selectSelf = L10n.Tr("For an overview select Analysis Type Self");
+            public static readonly string selectTotal = L10n.Tr("To include child times select Analysis Type Total");
+            public static readonly string selfTimeAllDepths = L10n.Tr("{0} Self time of markers at all depths");
+            public static readonly string selfTimeAtSpecificDepth = L10n.Tr("{0} Self time of markers at Depth {1}");
+
+            public static readonly string tooltip = L10n.Tr("{0}\n{1:f2}% ({2} on median frame {3})\n\nMedian marker time (in currently selected frames)\n{4} on frame {5}");
+        }
+
+        ProfileAnalyzerWindow m_ProfileAnalyzerWindow;
+        Draw2D m_2D;
+        Color m_BackgroundColor;
+        Color m_TextColor;
+
+        public TopMarkers(ProfileAnalyzerWindow profileAnalyzerWindow, Draw2D draw2D, Color backgroundColor, Color textColor)
+        {
+            m_ProfileAnalyzerWindow = profileAnalyzerWindow;
+            m_2D = draw2D;
+            m_BackgroundColor = backgroundColor;
+            m_TextColor = textColor;
+
+            m_CurrentSettings = new Settings(new RangeSettings(null, 0, null, null, TimingOptions.TimingOption.Time, 0, false), 0, 0, false, false);
+            m_TimeRangeDirty = true;
+        }
+
+        string ToDisplayUnits(float ms, bool showUnits = false, int limitToDigits = 5)
+        {
+            return m_ProfileAnalyzerWindow.ToDisplayUnits(ms, showUnits, limitToDigits);
+        }
+
+        public void SetData(ProfileDataView dataView, int depthFilter, List<string> nameFilters, List<string> nameExcludes, TimingOptions.TimingOption timingOption, int threadSelectionCount, bool hideRemovedMarkers)
+        {
+            m_RequestedRangeSettings = new RangeSettings(dataView, depthFilter, nameFilters, nameExcludes, timingOption, threadSelectionCount, hideRemovedMarkers);
+            if (m_CurrentSettings.rangeSettings != m_RequestedRangeSettings)
+                m_TimeRangeDirty = true;
+        }
+
+        float CalculateTopMarkerTimeRange(RangeSettings rangeSettings)
+        {
+            if (rangeSettings == null)
+                return 0.0f;
+            if (rangeSettings.dataView == null)
+                return 0.0f;
+
+            ProfileAnalysis analysis = rangeSettings.dataView.analysis;
+            if (analysis == null)
+                return 0.0f;
+
+            var frameSummary = analysis.GetFrameSummary();
+            if (frameSummary == null)
+                return 0.0f;
+
+            int depthFilter = rangeSettings.depthFilter;
+            List<string> nameFilters = rangeSettings.nameFilters;
+            List<string> nameExcludes = rangeSettings.nameExcludes;
+            bool hideRemovedMarkers = rangeSettings.hideRemovedMarkers;
+
+            var markers = analysis.GetMarkers();
+
+            float range = 0;
+            foreach (var marker in markers)
+            {
+                if (depthFilter != ProfileAnalyzer.kDepthAll && marker.minDepth != depthFilter)
+                {
+                    continue;
+                }
+
+                if (nameFilters.Count > 0)
+                {
+                    if (!m_ProfileAnalyzerWindow.NameInIncludeList(marker.name, nameFilters))
+                        continue;
+                }
+                if (nameExcludes.Count > 0)
+                {
+                    if (m_ProfileAnalyzerWindow.NameInExcludeList(marker.name, nameExcludes))
+                        continue;
+                }
+
+                if (hideRemovedMarkers && marker.IsFullyIgnored())
+                {
+                    continue;
+                }
+
+                range += marker.msAtMedian;
+            }
+
+            // Minimum is the frame time range
+            // As we can have unaccounted markers
+            if (range < frameSummary.msMedian)
+                range = frameSummary.msMedian;
+
+            return range;
+        }
+
+        public float GetTopMarkerTimeRange()
+        {
+            if (m_TimeRangeDirty)
+            {
+                Profiler.BeginSample("CalculateTopMarkerTimeRange");
+
+                // Use latest requested rather than current (as current may not yet be updated)
+                m_TimeRange = CalculateTopMarkerTimeRange(m_RequestedRangeSettings);
+                m_TimeRangeDirty = false;
+
+                Profiler.EndSample();
+            }
+
+            return m_TimeRange;
+        }
+
+        public MarkerSummary CalculateTopMarkers()
+        {
+            if (m_CurrentSettings.rangeSettings.dataView == null)
+                return null;
+
+            ProfileAnalysis analysis = m_CurrentSettings.rangeSettings.dataView.analysis;
+            if (analysis == null)
+                return null;
+
+            FrameSummary frameSummary = analysis.GetFrameSummary();
+            if (frameSummary == null)
+                return new MarkerSummary();
+
+            var markers = analysis.GetMarkers();
+            if (markers == null)
+                return new MarkerSummary();
+
+            float timeRange = m_CurrentSettings.timeRange;
+            int depthFilter = m_CurrentSettings.rangeSettings.depthFilter;
+            List<string> nameFilters = m_CurrentSettings.rangeSettings.nameFilters;
+            List<string> nameExcludes = m_CurrentSettings.rangeSettings.nameExcludes;
+            bool hideRemovedMarkers = m_CurrentSettings.rangeSettings.hideRemovedMarkers;
+
+            // Show marker graph
+            float x = 0;
+            float width = 1.0f;
+
+            int max = m_CurrentSettings.barCount;
+            int at = 0;
+
+            float other = 0.0f;
+
+            if (timeRange <= 0.0f)
+                timeRange = frameSummary.msMedian;
+
+            float msToWidth = width / timeRange;
+
+            float totalMarkerTime = 0;
+
+            MarkerSummary markerSummary = new MarkerSummary();
+
+            foreach (var marker in markers)
+            {
+                float msAtMedian = MarkerData.GetMsAtMedian(marker);
+
+                // We do this at the top so that totalMarkerTime is not increased
+                // This excludes the hidden markers time
+                if (hideRemovedMarkers && marker.IsFullyIgnored())
+                {
+                    continue;
+                }
+
+                if (depthFilter != ProfileAnalyzer.kDepthAll && marker.minDepth != depthFilter)
+                {
+                    continue;
+                }
+
+                if (nameFilters.Count > 0)
+                {
+                    if (!m_ProfileAnalyzerWindow.NameInIncludeList(marker.name, nameFilters))
+                        continue;
+                }
+                if (nameExcludes.Count > 0)
+                {
+                    if (m_ProfileAnalyzerWindow.NameInExcludeList(marker.name, nameExcludes))
+                        continue;
+                }
+
+                totalMarkerTime += msAtMedian;
+
+                if (at < max)
+                {
+                    float w = CaculateWidth(x, msAtMedian, msToWidth, width);
+                    float msMedian = MarkerData.GetMsMedian(marker);
+                    int medianFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(marker.medianFrameIndex, m_CurrentSettings.rangeSettings.dataView);
+                    markerSummary.entry.Add(new MarkerSummaryEntry(marker.name, msAtMedian, msMedian, x, w, medianFrameIndex, SummaryType.Marker));
+
+                    x += w;
+                }
+                else
+                {
+                    other += msAtMedian;
+                    if (!m_CurrentSettings.includeOthers)
+                        break;
+                }
+
+                at++;
+            }
+
+            if (m_CurrentSettings.includeOthers && other > 0.0f)
+            {
+                float w = CaculateWidth(x, other, msToWidth, width);
+                markerSummary.entry.Add(new MarkerSummaryEntry("Other", other, 0f, x, w, -1, SummaryType.Other));
+                x += w;
+            }
+            if (m_CurrentSettings.includeUnaccounted && totalMarkerTime < frameSummary.msMedian)
+            {
+                float unaccounted = frameSummary.msMedian - totalMarkerTime;
+                float w = CaculateWidth(x, unaccounted, msToWidth, width);
+                markerSummary.entry.Add(new MarkerSummaryEntry("Unaccounted", unaccounted, 0f, x, w, -1, SummaryType.Unaccounted));
+                x += w;
+            }
+
+            markerSummary.totalTime = totalMarkerTime;
+
+            return markerSummary;
+        }
+
+        GenericMenu GenerateActiveContextMenu(string markerName, Event evt)
+        {
+            GenericMenu menu = new GenericMenu();
+            menu.AddItem(Styles.menuItemSelectFramesInAll, false, () => m_ProfileAnalyzerWindow.SelectFramesContainingMarker(markerName, false));
+            menu.AddItem(Styles.menuItemSelectFramesInCurrent, false, () => m_ProfileAnalyzerWindow.SelectFramesContainingMarker(markerName, true));
+
+            if (m_ProfileAnalyzerWindow.AllSelected())
+                menu.AddDisabledItem(Styles.menuItemSelectFramesAll);
+            else
+                menu.AddItem(Styles.menuItemSelectFramesAll, false, () => m_ProfileAnalyzerWindow.SelectAllFrames());
+
+            menu.AddSeparator("");
+            if (!m_CurrentSettings.rangeSettings.nameFilters.Contains(markerName))
+                menu.AddItem(Styles.menuItemAddToIncludeFilter, false, () => m_ProfileAnalyzerWindow.AddToIncludeFilter(markerName));
+            else
+                menu.AddItem(Styles.menuItemRemoveFromIncludeFilter, false, () => m_ProfileAnalyzerWindow.RemoveFromIncludeFilter(markerName));
+            if (!m_CurrentSettings.rangeSettings.nameExcludes.Contains(markerName))
+                menu.AddItem(Styles.menuItemAddToExcludeFilter, false, () => m_ProfileAnalyzerWindow.AddToExcludeFilter(markerName));
+            else
+                menu.AddItem(Styles.menuItemRemoveFromExcludeFilter, false, () => m_ProfileAnalyzerWindow.RemoveFromExcludeFilter(markerName));
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemSetAsParentMarkerFilter, false, () => m_ProfileAnalyzerWindow.SetAsParentMarkerFilter(markerName));
+            menu.AddItem(Styles.menuItemClearParentMarkerFilter, false, () => m_ProfileAnalyzerWindow.SetAsParentMarkerFilter(""));
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemSetAsRemoveMarker, false, () => m_ProfileAnalyzerWindow.SetAsRemoveMarker(markerName));
+            menu.AddSeparator("");
+            menu.AddItem(Styles.menuItemCopyToClipboard, false, () => CopyToClipboard(evt, markerName));
+
+            return menu;
+        }
+
+        GenericMenu GenerateDisabledContextMenu(string markerName)
+        {
+            GenericMenu menu = new GenericMenu();
+            menu.AddDisabledItem(Styles.menuItemSelectFramesInAll);
+            menu.AddDisabledItem(Styles.menuItemSelectFramesInCurrent);
+            menu.AddDisabledItem(Styles.menuItemSelectFramesAll);
+
+            menu.AddSeparator("");
+            if (!m_CurrentSettings.rangeSettings.nameFilters.Contains(markerName))
+                menu.AddDisabledItem(Styles.menuItemAddToIncludeFilter);
+            else
+                menu.AddDisabledItem(Styles.menuItemRemoveFromIncludeFilter);
+            if (!m_CurrentSettings.rangeSettings.nameExcludes.Contains(markerName))
+                menu.AddDisabledItem(Styles.menuItemAddToExcludeFilter);
+            else
+                menu.AddDisabledItem(Styles.menuItemRemoveFromExcludeFilter);
+
+            menu.AddSeparator("");
+            menu.AddDisabledItem(Styles.menuItemSetAsParentMarkerFilter);
+            menu.AddDisabledItem(Styles.menuItemClearParentMarkerFilter);
+            menu.AddSeparator("");
+            menu.AddDisabledItem(Styles.menuItemSetAsRemoveMarker);
+            menu.AddSeparator("");
+            menu.AddDisabledItem(Styles.menuItemCopyToClipboard);
+
+            return menu;
+        }
+        
+        public GUIContent ConstructTimeRangeText()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            ProfileAnalysis analysis = m_CurrentSettings.rangeSettings.dataView.analysis;
+            int depthFilter = m_CurrentSettings.rangeSettings.depthFilter;
+            
+            FrameSummary frameSummary = analysis.GetFrameSummary();
+
+            string frameTimeString = ToDisplayUnits(frameSummary.msMedian, true, 0);
+            string accountedTimeString = ToDisplayUnits(m_MarkerSummary.totalTime, true, 0);
+            sb.AppendFormat(Content.frameTime, frameTimeString);
+
+            // Note m_CurrentSettings.rangeSettings.dataView.analysis.GetThreads contains all thread names, not just the filtered threads
+            bool singleThread = m_CurrentSettings.rangeSettings.threadSelectionCount == 1;
+
+            if (depthFilter == ProfileAnalyzer.kDepthAll)
+            {
+                if (m_CurrentSettings.rangeSettings.timingOption == TimingOptions.TimingOption.Time)
+                {
+                    sb.Append("\n");
+                    sb.AppendFormat(Content.totalTimeAllDepths, accountedTimeString);
+                    if (singleThread)
+                    {
+                        sb.Append("\n\n");
+                        sb.Append(Content.selectSelf);
+                    }
+                }
+                else
+                {
+                    sb.Append("\n");
+                    sb.AppendFormat(Content.selfTimeAllDepths,accountedTimeString);
+                }
+            }
+            else 
+            {
+                if (m_CurrentSettings.rangeSettings.timingOption == TimingOptions.TimingOption.Self)
+                {
+                    sb.Append("\n");
+                    sb.AppendFormat(Content.selfTimeAtSpecificDepth,accountedTimeString, depthFilter);
+                    if (singleThread)
+                    {
+                        sb.Append("\n\n");
+                        sb.Append(Content.selectTotal);
+                    }
+                }
+                else
+                {
+                    sb.Append("\n");
+                    sb.AppendFormat(Content.totalTimeAtSpecificDepth, accountedTimeString, depthFilter);
+                }
+            }
+
+            if (!singleThread)
+            {
+                sb.Append("\n\n");
+                sb.Append(Content.multipleThreads);
+            }
+
+            string timeRangeString = ToDisplayUnits(m_CurrentSettings.timeRange, true);
+            return new GUIContent(timeRangeString, sb.ToString());
+        } 
+
+        public void Draw(Rect rect, Color barColor, int barCount, float timeRange, Color selectedBackground, Color selectedBorder, Color selectedText, bool includeOthers, bool includeUnaccounted)
+        {
+            Settings newSettings = new Settings(m_RequestedRangeSettings, barCount, timeRange, includeOthers, includeUnaccounted);
+            if (m_CurrentSettings != newSettings)
+            {
+                Profiler.BeginSample("CalculateTopMarkers");
+
+                m_CurrentSettings = newSettings;
+                m_MarkerSummary = CalculateTopMarkers();
+
+                Profiler.EndSample();
+            }
+
+            if (m_CurrentSettings.rangeSettings == null)
+                return;
+            if (m_CurrentSettings.rangeSettings.dataView == null)
+                return;
+            if (m_CurrentSettings.rangeSettings.dataView.analysis == null)
+                return;
+
+            if (m_MarkerSummary == null || m_MarkerSummary.entry == null)
+                return;
+
+            ProfileAnalysis analysis = m_CurrentSettings.rangeSettings.dataView.analysis;
+            
+            FrameSummary frameSummary = analysis.GetFrameSummary();
+            if (frameSummary == null)
+                return;
+            if (frameSummary.count <= 0)
+                return;
+
+            var markers = analysis.GetMarkers();
+            if (markers == null)
+                return;
+
+            Profiler.BeginSample("DrawHeader");
+
+            int rangeLabelWidth = 60;
+
+            // After the marker graph we want an indication of the time range
+            if (frameSummary.count > 0)
+            {
+                Rect rangeLabelRect = new Rect(rect.x + rect.width - rangeLabelWidth, rect.y, rangeLabelWidth, rect.height);
+                GUIContent timeRangeText = ConstructTimeRangeText();
+                GUI.Label(rangeLabelRect, timeRangeText);
+            }
+
+            // Reduce the size of the marker graph for the button/label we just added
+            rect.width -= rangeLabelWidth;
+
+            // Show marker graph
+            float y = 0;
+            float width = rect.width;
+            float height = rect.height;
+
+            string selectedPairingMarkerName = m_ProfileAnalyzerWindow.GetSelectedMarkerName();
+
+            if (timeRange <= 0.0f)
+                timeRange = frameSummary.msMedian;
+
+            Profiler.EndSample();
+
+            if (m_2D.DrawStart(rect, Draw2D.Origin.BottomLeft))
+            {
+                Profiler.BeginSample("DrawBars");
+
+                m_2D.DrawFilledBox(0, y, width, height, m_BackgroundColor);
+
+                foreach (MarkerSummaryEntry entry in m_MarkerSummary.entry)
+                {
+                    String name = entry.name;
+
+                    float x = entry.x * width;
+                    float w = entry.w * width;
+                    if (entry.summaryType == SummaryType.Marker)
+                    {
+                        if (name == selectedPairingMarkerName)
+                        {
+                            DrawBar(x, y, w, height, selectedBackground, selectedBorder, true);
+                        }
+                        else
+                        {
+                            DrawBar(x, y, w, height, barColor, selectedBorder, false);
+                        }
+                    }
+                    else
+                    {
+                        // Others / Unaccounted
+                        Color color = entry.summaryType == SummaryType.Unaccounted ? new Color(barColor.r * 0.5f, barColor.g * 0.5f, barColor.b * 0.5f, barColor.a) : barColor;
+
+                        DrawBar(x, y, w, height, color, selectedBorder, false);
+                    }
+                }
+
+                Profiler.EndSample();
+
+                m_2D.DrawEnd();
+            }
+
+            GUIStyle centreAlignStyle = new GUIStyle(GUI.skin.label);
+            centreAlignStyle.alignment = TextAnchor.MiddleCenter;
+            centreAlignStyle.normal.textColor = m_TextColor;
+            GUIStyle leftAlignStyle = new GUIStyle(GUI.skin.label);
+            leftAlignStyle.alignment = TextAnchor.MiddleLeft;
+            leftAlignStyle.normal.textColor = m_TextColor;
+            Color contentColor = GUI.contentColor;
+
+            int frameSummaryMedianFrameIndex = m_ProfileAnalyzerWindow.GetRemappedUIFrameIndex(frameSummary.medianFrameIndex, m_CurrentSettings.rangeSettings.dataView);
+
+            Profiler.BeginSample("DrawText");
+            foreach (MarkerSummaryEntry entry in m_MarkerSummary.entry)
+            {
+                if (entry.summaryType == SummaryType.Marker)
+                {
+                    DrawEntryBarText(rect, width, timeRange, entry, leftAlignStyle, frameSummaryMedianFrameIndex, selectedText, centreAlignStyle, selectedPairingMarkerName);
+                }
+                else
+                {
+                    // Note this only displays the tooltip and not the text itself as we assume unaccounted is small
+                    DrawSimpleEntryBarText(rect, width, timeRange, entry, leftAlignStyle, frameSummaryMedianFrameIndex);
+                }
+            }
+
+            Profiler.EndSample();
+        }
+
+        static float CaculateWidth(float x, float msTime, float msToWidth, float width)
+        {
+            float w = msTime * msToWidth;
+            if (x + w > width)
+                w = width - x;
+
+            return w;
+        }
+
+        float DrawBar(float x, float y, float w, float height, Color barColor, Color selectedBorder, bool withBorder)
+        {
+            if (withBorder)
+                m_2D.DrawFilledBox(x + 1, y + 1, w, height - 2, selectedBorder);
+
+            m_2D.DrawFilledBox(x + 2, y + 2, w - 2, height - 4, barColor);
+
+            return w;
+        }
+
+        void DrawEntryBarText(Rect rect, float totalWidth, float timeRange, MarkerSummaryEntry entry, GUIStyle leftAlignStyle, int frameSummaryMedianFrameIndex, Color selectedText, GUIStyle centreAlignStyle, string selectedPairingMarkerName)
+        {
+            float x = entry.x * totalWidth;
+            float w = entry.w * totalWidth;
+            String name = entry.name;
+            float msAtMedian = entry.msAtMedian;
+
+            Rect labelRect = new Rect(rect.x + x, rect.y, w, rect.height);
+            GUIStyle style = centreAlignStyle;
+            String displayName = "";
+            if (w >= 20)
+            {
+                displayName = name;
+                Vector2 size = centreAlignStyle.CalcSize(new GUIContent(name));
+                if (size.x > w)
+                {
+                    var words = name.Split('.');
+                    displayName = words[words.Length - 1];
+                    style = leftAlignStyle;
+                }
+            }
+
+            float percentAtMedian = msAtMedian * 100 / timeRange;
+            string tooltip = string.Format(
+                Content.tooltip,
+                name,
+                percentAtMedian, ToDisplayUnits(msAtMedian, true, 0), frameSummaryMedianFrameIndex,
+                ToDisplayUnits(entry.msMedian, true, 0), entry.medianFrameIndex);
+            if (name == selectedPairingMarkerName)
+                style.normal.textColor = selectedText;
+            else
+                style.normal.textColor = m_TextColor;
+            GUI.Label(labelRect, new GUIContent(displayName, tooltip), style);
+
+            Event current = Event.current;
+            if (labelRect.Contains(current.mousePosition))
+            {
+                if (current.type == EventType.ContextClick)
+                {
+                    GenericMenu menu;
+                    if (!m_ProfileAnalyzerWindow.IsAnalysisRunning())
+                        menu = GenerateActiveContextMenu(name, current);
+                    else
+                        menu = GenerateDisabledContextMenu(name);
+
+                    menu.ShowAsContext();
+
+                    current.Use();
+                }
+                if (current.type == EventType.MouseDown)
+                {
+                    m_ProfileAnalyzerWindow.SelectMarker(name);
+                    m_ProfileAnalyzerWindow.RequestRepaint();
+                }
+            }
+        }
+
+        void DrawSimpleEntryBarText(Rect rect, float totalWidth, float timeRange, MarkerSummaryEntry entry, GUIStyle leftAlignStyle, int frameSummaryMedianFrameIndex)
+        {
+            float x = entry.x * totalWidth;
+            float w = entry.w * totalWidth;
+            String name = entry.name;
+            float msAtMedian = entry.msAtMedian;
+
+            float width = rect.width;
+            Rect labelRect = new Rect(rect.x + x, rect.y, w, rect.height);
+            float percent = msAtMedian / timeRange * 100;
+            GUIStyle style = leftAlignStyle;
+            string tooltip = string.Format("{0}\n{1:f2}% ({2} on median frame {3})",
+                name,
+                percent,
+                ToDisplayUnits(msAtMedian, true, 0),
+                frameSummaryMedianFrameIndex);
+            GUI.Label(labelRect, new GUIContent("", tooltip), style);
+
+            Event current = Event.current;
+            if (labelRect.Contains(current.mousePosition))
+            {
+                if (current.type == EventType.ContextClick)
+                {
+                    GenericMenu menu = new GenericMenu();
+
+                    if (!m_ProfileAnalyzerWindow.IsAnalysisRunning())
+                        menu.AddItem(Styles.menuItemSelectFramesAll, false, m_ProfileAnalyzerWindow.SelectAllFrames);
+                    else
+                        menu.AddDisabledItem(Styles.menuItemSelectFramesAll);
+
+                    menu.ShowAsContext();
+
+                    current.Use();
+                }
+                if (current.type == EventType.MouseDown)
+                {
+                    m_ProfileAnalyzerWindow.SelectMarker(null);
+                    m_ProfileAnalyzerWindow.RequestRepaint();
+                }
+            }
+        }
+
+        void CopyToClipboard(Event current, string text)
+        {
+            EditorGUIUtility.systemCopyBuffer = text;
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkers.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkers.cs.meta
new file mode 100644
index 0000000..2d6dca3
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/TopMarkers.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 406c1c524495d4e0283f7848bbbfedc9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Units.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Units.cs
new file mode 100644
index 0000000..208235c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Units.cs
@@ -0,0 +1,237 @@
+using System;
+using System.Globalization;
+using UnityEngine.Assertions;
+using UnityEngine;
+
+namespace UnityEditor.Performance.ProfileAnalyzer
+{
+    /// <summary>Unit type identifier</summary>
+    internal enum Units
+    {
+        /// <summary>Time in milliseconds</summary>
+        Milliseconds,
+        /// <summary>Time in microseconds</summary>
+        Microseconds,
+        /// <summary>Count of number of instances</summary>
+        Count,
+    };
+
+    internal class DisplayUnits
+    {
+        public static readonly string[] UnitNames =
+        {
+            "Milliseconds",
+            "Microseconds",
+            "Count",
+        };
+
+        public static readonly int[] UnitValues = (int[])Enum.GetValues(typeof(Units));
+
+        public readonly Units Units;
+
+        const bool kShowFullValueWhenBelowZero = true;
+        const int kTooltipDigitsNumber = 7;
+
+        public DisplayUnits(Units units)
+        {
+            Assert.AreEqual(UnitNames.Length, UnitValues.Length, "Number of UnitNames should match number of enum values UnitValues: You probably forgot to update one of them.");
+
+            Units = units;
+        }
+
+        public string Postfix()
+        {
+            switch (Units)
+            {
+                default:
+                case Units.Milliseconds:
+                    return "ms";
+                case Units.Microseconds:
+                    return "us";
+                case Units.Count:
+                    return "";
+            }
+        }
+
+        int ClampToRange(int value, int min, int max)
+        {
+            if (value < min)
+                value = min;
+            if (value > max)
+                value = max;
+
+            return value;
+        }
+
+        string RemoveTrailingZeros(string numberStr, int minNumberStringLength)
+        {
+            // Find out string length without trailing zeroes.
+            var strLenWithoutTrailingZeros = numberStr.Length;
+            while (strLenWithoutTrailingZeros > minNumberStringLength && numberStr[strLenWithoutTrailingZeros - 1] == '0')
+                strLenWithoutTrailingZeros--;
+
+            // Remove hanging '.' in case all zeroes can be omitted.
+            if (strLenWithoutTrailingZeros > 0 && numberStr[strLenWithoutTrailingZeros - 1] == '.')
+                strLenWithoutTrailingZeros--;
+
+
+            return strLenWithoutTrailingZeros == numberStr.Length ? numberStr : numberStr.Substring(0, strLenWithoutTrailingZeros);
+        }
+
+        public string ToString(float ms, bool showUnits, int limitToNDigits, bool showFullValueWhenBelowZero = false)
+        {
+            float value = ms;
+            int unitPower = -3;
+
+            int minNumberStringLength = -1;
+            int maxDecimalPlaces = 0;
+            float minValueShownWhenUsingLimitedDecimalPlaces = 1f;
+            switch (Units)
+            {
+                default:
+                case Units.Milliseconds:
+                    maxDecimalPlaces = 2;
+                    minValueShownWhenUsingLimitedDecimalPlaces = 0.01f;
+                    break;
+                case Units.Microseconds:
+                    value *= 1000f;
+                    unitPower -= 3;
+                    if (value < 100)
+                    {
+                        maxDecimalPlaces = 1;
+                        minValueShownWhenUsingLimitedDecimalPlaces = 0.1f;
+                    }
+                    else
+                    {
+                        maxDecimalPlaces = 0;
+                        minValueShownWhenUsingLimitedDecimalPlaces = 1f;
+                    }
+                    break;
+                case Units.Count:
+                    showUnits = false;
+                    break;
+            }
+
+            int sgn = Math.Sign(value);
+            if (value < 0)
+                value = -value;
+            int numberOfDecimalPlaces = maxDecimalPlaces;
+            int unitsTextLength = showUnits ? 2 : 0;
+            int signTextLength = sgn == -1 ? 1 : 0;
+            if (limitToNDigits > 0 && value > float.Epsilon)
+            {
+                int numberOfSignificantFigures = limitToNDigits;
+                if (!showFullValueWhenBelowZero)
+                    numberOfSignificantFigures -= unitsTextLength + signTextLength;
+
+                int valueExp = (int)Math.Log10(value);
+                // Less than 1 values needs exponent correction as (int) rounds to the upper negative.
+                if (value < 1)
+                    valueExp -= 1;
+
+                int originalUnitPower = unitPower;
+                float limitRange = (float)Math.Pow(10, numberOfSignificantFigures);
+                if (limitRange > 0)
+                {
+                    if (value >= limitRange)
+                    {
+                        while (value >= 1000f && unitPower < 9)
+                        {
+                            value /= 1000f;
+                            unitPower += 3;
+                            valueExp -= 3;
+                        }
+                    }
+                    else if (showFullValueWhenBelowZero) // Only upscale and change unit type if we want to see exact number.
+                    {
+                        while (value < 0.01f && unitPower > -9)
+                        {
+                            value *= 1000f;
+                            unitPower -= 3;
+                            valueExp += 3;
+                        }
+                    }
+                }
+
+                if (unitPower != originalUnitPower)
+                {
+                    showUnits = true;
+                    unitsTextLength = 2;
+                    numberOfSignificantFigures = limitToNDigits;
+                    if (!showFullValueWhenBelowZero)
+                        numberOfSignificantFigures -= unitsTextLength + signTextLength;
+                }
+
+                // Use all allowed digits to display significant digits if we have any beyond maxDecimalPlaces
+                int numberOfDigitsBeforeDecimalPoint = 1 + Math.Max(0, valueExp);
+                if (showFullValueWhenBelowZero)
+                {
+                    numberOfDecimalPlaces = numberOfSignificantFigures - numberOfDigitsBeforeDecimalPoint;
+                    minNumberStringLength = numberOfDigitsBeforeDecimalPoint + signTextLength + maxDecimalPlaces + 1;
+                }
+                else
+                    numberOfDecimalPlaces = ClampToRange(numberOfSignificantFigures - numberOfDigitsBeforeDecimalPoint, 0, maxDecimalPlaces);
+            }
+
+            value *= sgn;
+
+            string numberStr;
+            if (value < minValueShownWhenUsingLimitedDecimalPlaces && showFullValueWhenBelowZero)
+            {
+                numberStr = string.Format(CultureInfo.InvariantCulture, "{0}", value);
+            }
+            else
+            {
+                string formatString = string.Concat("{0:f", numberOfDecimalPlaces, "}");
+                numberStr = string.Format(CultureInfo.InvariantCulture, formatString, value);
+            }
+
+            // Remove trailing 0 if any from string
+            if (minNumberStringLength > 0 && numberStr.Length > 0)
+                numberStr = RemoveTrailingZeros(numberStr, minNumberStringLength);
+
+            if (!showUnits)
+                return numberStr;
+
+            string siUnitString = GetSIUnitString(unitPower) + "s";
+            return string.Concat(numberStr, siUnitString);
+        }
+
+        public static string GetSIUnitString(int unitPower)
+        {
+            // https://en.wikipedia.org/wiki/Metric_prefix
+            switch (unitPower)
+            {
+                case -9:
+                    return "n";
+                case -6:
+                    return "u";
+                case -3:
+                    return "m";
+                case 0:
+                    return "";
+                case 3:
+                    return "k";
+                case 6:
+                    return "M";
+                case 9:
+                    return "G";
+            }
+
+            return "?";
+        }
+
+        public string ToTooltipString(double ms, bool showUnits, int frameIndex = -1)
+        {
+            if (frameIndex >= 0)
+                return string.Format("{0} on frame {1}", ToString((float)ms, showUnits, kTooltipDigitsNumber, kShowFullValueWhenBelowZero), frameIndex);
+
+            return ToString((float)ms, showUnits, kTooltipDigitsNumber, kShowFullValueWhenBelowZero);
+        }
+
+        public GUIContent ToGUIContentWithTooltips(float ms, bool showUnits = false, int limitToNDigits = 5, int frameIndex = -1)
+        {
+            return new GUIContent(ToString(ms, showUnits, limitToNDigits), ToTooltipString(ms, true, frameIndex));
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Units.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Units.cs.meta
new file mode 100644
index 0000000..809150b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Units.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0a92e3733078e4ca68373f1d6c83f584
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Unity.Performance.Profile-Analyzer.Editor.asmdef b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Unity.Performance.Profile-Analyzer.Editor.asmdef
new file mode 100644
index 0000000..c05cd1b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Unity.Performance.Profile-Analyzer.Editor.asmdef
@@ -0,0 +1,10 @@
+{
+    "name": "Unity.Performance.Profile-Analyzer.Editor",
+    "references": [],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false
+}
\ No newline at end of file
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Unity.Performance.Profile-Analyzer.Editor.asmdef.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Unity.Performance.Profile-Analyzer.Editor.asmdef.meta
new file mode 100644
index 0000000..80191e1
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Editor/Unity.Performance.Profile-Analyzer.Editor.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 211d499e772b640dbb43b9de9b957156
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/LICENSE.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/LICENSE.md
new file mode 100644
index 0000000..ec84d5c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/LICENSE.md
@@ -0,0 +1,5 @@
+Profile Analyzer copyright © 2020 Unity Technologies ApS
+
+Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License). 
+
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/LICENSE.md.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/LICENSE.md.meta
new file mode 100644
index 0000000..a214cde
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/LICENSE.md.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1122c571e35634d4aba967c658ce3720
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/README.md b/Packages/com.unity.performance.profile-analyzer@1.2.4/README.md
new file mode 100644
index 0000000..4d0384c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/README.md
@@ -0,0 +1,32 @@
+# Profile Analyzer
+
+## What Is This
+The Profile Analyzer aggregates and visualises frame and marker data from a set of Unity Profiler frames to help you reason about their behaviour over a number of frames, complementing the single frame analysis already available in the Unity Profiler.
+
+
+Features:
+* Multi frame analysis of a single scan
+  * Each marker is shown with its median, min, max values over all frames, including histogram and box and whisker plots to view the distribution
+  * Various filtering options are available to limit the markers displayed by thread, call depth and name substrings.
+  * Data can be sorted for each of the displayed values.
+* Comparison of two multi frame profile scans
+  * Each marker is shown with the difference in values between the scans, including with a visualisation to help quickly identify the key differences.
+  * Supports comparison of scans from two different Unity versions, or before and after an optimization is applied.
+
+## How To Run
+Add the Profile Analyzer folder to your Unity project or install as a package.
+The 'Profile Analyzer' tool is opened via the menu item below the 'Window/Analysis' Menu in the Unity menu bar (or just in the 'Window' menu prior to 2018.1).
+
+## Capturing Data
+Use the standard Unity Profiler to record profiling data from your application.
+In the Profile Analyzer pull the profiler data from the Unity Profiler.
+The profile data will be analyzed and appear in the single view along with both sides of the Compare View.
+This capture can be saved as a .pdata file for later comparision or sharing with others.
+
+## Comparing Two Data Sets
+Pull data or load a previous .pdata file into the Left and Right slots to compare the two sets, comparison results will instantly appear.
+
+## More Information
+For more information on the UI and common workflows please see the [full documentation](Documentation~/index.md).
+
+
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/README.md.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/README.md.meta
new file mode 100644
index 0000000..0b4b3f5
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/README.md.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0d920e84785e4472aab610f3f203b389
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests.meta
new file mode 100644
index 0000000..6be28d9
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b976a2f5130b84c3a90b425f246cc3c7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/.tests.json b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/.tests.json
new file mode 100644
index 0000000..327abb2
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/.tests.json
@@ -0,0 +1,3 @@
+{
+	"createSeparatePackage": false
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor.meta
new file mode 100644
index 0000000..4bf5aac
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4ebedeac5794145928b99e3e0e6169e7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/FrameTimeGraphSelectionTests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/FrameTimeGraphSelectionTests.cs
new file mode 100644
index 0000000..6ebae9d
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/FrameTimeGraphSelectionTests.cs
@@ -0,0 +1,409 @@
+using NUnit.Framework;
+using System.Collections.Generic;
+using UnityEditor.Performance.ProfileAnalyzer;
+using UnityEngine;
+using System.Text;
+
+public class FrameTimeGraphSelectionTests
+{
+    static readonly MoveTestConfiguration[] k_MoveTestConfigurations =
+    {
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(0, 10)
+        }, 10),    // range[0-9] + 10
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(20, 10)
+        }, -10),    // range[20-29] - 10
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 10),
+            new TestConfiguration.SelectionRange(100, 10)
+        }, 10),    // multi-select range[50-59][100-109] + 10
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 10),
+            new TestConfiguration.SelectionRange(100, 10)
+        }, -10),    // multi-select range[50-59][100-109] - 10
+    };
+
+    // Expects a 300 frame capture.
+    static readonly MoveTestConfiguration[] k_MoveClampToBoundsTestConfigurations =
+    {
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(0, 10)
+        }, -10),    // range[0-9] - 10
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(290, 10)
+        }, 10),    // range[290-299] + 10
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(0, 10),
+            new TestConfiguration.SelectionRange(50, 10)
+        }, -10),    // multi-select range[0-9][50-59] - 10
+        new MoveTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(0, 10),
+            new TestConfiguration.SelectionRange(290, 10)
+        }, 10),    // multi-select range[0-9][290-299] + 10
+    };
+
+    static readonly ResizeTestConfiguration[] k_ResizeTestConfigurations =
+    {
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(100, 100)
+        }, -10, 10),    // range[100-199] grow [-10, 10]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(100, 100)
+        }, 10, -10),    // range[100-199] shrink [10, -10]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 50),
+            new TestConfiguration.SelectionRange(200, 50)
+        }, -10, 10),    // multi-select range[50-99][200-249] grow [-10, 10]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 50),
+            new TestConfiguration.SelectionRange(200, 50)
+        }, 10, -10),    // multi-select range[50-99][200-249] shrink [10, -10]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 50),
+            new TestConfiguration.SelectionRange(200, 50)
+        }, -10, 0),    // multi-select range[50-99][200-249] grow left [-10, 0]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 50),
+            new TestConfiguration.SelectionRange(200, 50)
+        }, 0, 10),    // multi-select range[50-99][200-249] grow right [0, 10]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 50),
+            new TestConfiguration.SelectionRange(200, 50)
+        }, 10, 0),    // multi-select range[50-99][200-249] shrink left [10, 0]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(50, 50),
+            new TestConfiguration.SelectionRange(200, 50)
+        }, 0, -10),    // multi-select range[50-99][200-249] shrink right [0, -10]
+    };
+
+    // Expects a 300 frame capture.
+    static readonly ResizeTestConfiguration[] k_ResizeClampToBoundsTestConfigurations =
+    {
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(0, 10)
+        }, -10, 0),    // range[0-9] grow left [-10, 0]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(290, 10)
+        }, 0, 10),    // range[290-299] grow right [0, 10]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(0, 10),
+            new TestConfiguration.SelectionRange(50, 10)
+        }, -10, 0),    // range[0-9][50-59] grow left [-10, 0]
+        new ResizeTestConfiguration(new TestConfiguration.SelectionRange[]
+        {
+            new TestConfiguration.SelectionRange(0, 10),
+            new TestConfiguration.SelectionRange(290, 10)
+        }, 0, 10),    // range[0-9][290-299] grow right [0, 10]
+    };
+
+    FrameTimeGraph m_FrameTimeGraph;
+    List<int> m_ReportedSelection;
+
+    [OneTimeSetUp]
+    public void OneTimeSetUp()
+    {
+        var data = GenerateFrameTimeGraphData();
+        m_FrameTimeGraph = NewFrameTimeGraph();
+        m_FrameTimeGraph.SetData(data);
+        m_FrameTimeGraph.SetRangeCallback(OnFrameTimeGraphDidSetRange);
+    }
+
+    [SetUp]
+    public void SetUp()
+    {
+        m_ReportedSelection = new List<int>();
+    }
+
+    [Test]
+    public void FrameTimeGraph_MoveSelectedRange([ValueSource("k_MoveTestConfigurations")] MoveTestConfiguration configuration)
+    {
+        List<int> expectedSelection = ExpectedSelectedFramesForMoveTestConfiguration(configuration);
+        FrameTimeGraph_MoveSelectedRange(configuration, expectedSelection);
+    }
+
+    [Test]
+    public void FrameTimeGraph_MoveSelectedRange_DoesNotMovePastGraphBounds([ValueSource("k_MoveClampToBoundsTestConfigurations")] MoveTestConfiguration configuration)
+    {
+        List<int> expectedSelection = InitialSelectedFramesForTestConfiguration(configuration);
+        FrameTimeGraph_MoveSelectedRange(configuration, expectedSelection);
+    }
+
+    void FrameTimeGraph_MoveSelectedRange(MoveTestConfiguration configuration, List<int> expectedSelection)
+    {
+        var offset = configuration.offset;
+        int clickCount = 1;
+        bool singleClickAction = true;
+        var currentSelectionState = SelectedRangeStateFromTestConfiguration(configuration);
+
+        m_FrameTimeGraph.MoveSelectedRange(offset, clickCount, singleClickAction, FrameTimeGraph.State.None, currentSelectionState);
+
+        CollectionAssert.AreEqual(expectedSelection, m_ReportedSelection);
+    }
+
+    [Test]
+    public void FrameTimeGraph_ResizeSelectedRange([ValueSource("k_ResizeTestConfigurations")] ResizeTestConfiguration configuration)
+    {
+        List<int> expectedSelection = ExpectedSelectedFramesForResizeTestConfiguration(configuration);
+        FrameTimeGraph_ResizeSelectedRange(configuration, expectedSelection);
+    }
+
+    [Test]
+    public void FrameTimeGraph_ResizeSelectedRange_DoesNotMovePastGraphBounds([ValueSource("k_ResizeClampToBoundsTestConfigurations")] ResizeTestConfiguration configuration)
+    {
+        List<int> expectedSelection = InitialSelectedFramesForTestConfiguration(configuration);
+        FrameTimeGraph_ResizeSelectedRange(configuration, expectedSelection);
+    }
+
+    void FrameTimeGraph_ResizeSelectedRange(ResizeTestConfiguration configuration, List<int> expectedSelection)
+    {
+        var leftOffset = configuration.leftOffset;
+        var rightOffset = configuration.rightOffset;
+        int clickCount = 1;
+        bool singleClickAction = true;
+        var currentSelectionState = SelectedRangeStateFromTestConfiguration(configuration);
+
+        m_FrameTimeGraph.ResizeSelectedRange(leftOffset, rightOffset, clickCount, singleClickAction, FrameTimeGraph.State.None, currentSelectionState);
+
+        CollectionAssert.AreEqual(expectedSelection, m_ReportedSelection);
+    }
+
+    FrameTimeGraph NewFrameTimeGraph()
+    {
+        var draw2D = new Draw2D("Unlit/ProfileAnalyzerShader");
+        DisplayUnits displayUnits = new DisplayUnits(Units.Milliseconds);
+        return new FrameTimeGraph(0, draw2D, displayUnits.Units, ProfileAnalyzerWindow.UIColor.barBackground, ProfileAnalyzerWindow.UIColor.barBackgroundSelected, ProfileAnalyzerWindow.UIColor.bar, ProfileAnalyzerWindow.UIColor.barSelected, ProfileAnalyzerWindow.UIColor.marker, ProfileAnalyzerWindow.UIColor.markerSelected, ProfileAnalyzerWindow.UIColor.thread, ProfileAnalyzerWindow.UIColor.threadSelected, ProfileAnalyzerWindow.UIColor.gridLines);
+    }
+
+    List<FrameTimeGraph.Data> GenerateFrameTimeGraphData()
+    {
+        const int k_DataLength = 300;
+        var data = new List<FrameTimeGraph.Data>(k_DataLength);
+        int i = 0;
+        while (i < k_DataLength)
+        {
+            var frameData = new FrameTimeGraph.Data(Random.value * 16, i);
+            data.Add(frameData);
+            i++;
+        }
+
+        return data;
+    }
+
+    void OnFrameTimeGraphDidSetRange(List<int> selected, int clickCount, FrameTimeGraph.State inputStatus)
+    {
+        m_ReportedSelection = selected;
+    }
+
+    FrameTimeGraph.SelectedRangeState SelectedRangeStateFromTestConfiguration(TestConfiguration configuration)
+    {
+        List<int> selectedFrames = InitialSelectedFramesForTestConfiguration(configuration);
+        int currentSelectionFirstDataOffset;
+        int currentSelectionLastDataOffset;
+        int firstFrameOffset;
+        int lastFrameOffset;
+        m_FrameTimeGraph.GetSelectedRange(selectedFrames, out currentSelectionFirstDataOffset, out currentSelectionLastDataOffset, out firstFrameOffset, out lastFrameOffset);
+
+        return new FrameTimeGraph.SelectedRangeState()
+        {
+            currentSelectionFirstDataOffset = currentSelectionFirstDataOffset,
+            currentSelectionLastDataOffset = currentSelectionLastDataOffset,
+            lastSelectedFrameOffsets = selectedFrames,
+        };
+    }
+
+    List<int> InitialSelectedFramesForTestConfiguration(TestConfiguration configuration)
+    {
+        List<int> selectedFrames = new List<int>();
+        foreach (var selectionRange in configuration.selections)
+        {
+            var selectionFrames = GenerateListOfFrames(selectionRange.origin, selectionRange.length);
+            selectedFrames.AddRange(selectionFrames);
+        }
+
+        return selectedFrames;
+    }
+
+    List<int> ExpectedSelectedFramesForMoveTestConfiguration(MoveTestConfiguration configuration)
+    {
+        List<int> selectedFrames = new List<int>();
+        var offset = configuration.offset;
+        foreach (var selectionRange in configuration.selections)
+        {
+            var selectionFrames = GenerateListOfFrames(selectionRange.origin + offset, selectionRange.length);
+            selectedFrames.AddRange(selectionFrames);
+        }
+
+        return selectedFrames;
+    }
+
+    List<int> ExpectedSelectedFramesForResizeTestConfiguration(ResizeTestConfiguration configuration)
+    {
+        List<int> selectedFrames = new List<int>();
+        var leftOffset = configuration.leftOffset;
+        var rightOffset = configuration.rightOffset;
+        foreach (var selectionRange in configuration.selections)
+        {
+            var leftIndex = selectionRange.origin + leftOffset;
+            var rightIndex = selectionRange.LastIndex + rightOffset;
+            var selectionLength = rightIndex - leftIndex + 1;
+            var selectionFrames = GenerateListOfFrames(selectionRange.origin + leftOffset, selectionLength);
+            selectedFrames.AddRange(selectionFrames);
+        }
+
+        return selectedFrames;
+    }
+
+    List<int> GenerateListOfFrames(int origin, int count)
+    {
+        var frames = new List<int>();
+
+        int i = 0;
+        while (i < count)
+        {
+            frames.Add(origin + i);
+            ++i;
+        }
+
+        return frames;
+    }
+
+    public class TestConfiguration
+    {
+        public SelectionRange[] selections;
+
+        public TestConfiguration(SelectionRange[] selections)
+        {
+            this.selections = selections;
+        }
+
+        protected string SelectionsToString()
+        {
+            var stringBuilder = new StringBuilder();
+            for (int i = 0; i < selections.Length; ++i)
+            {
+                var selection = selections[i];
+                stringBuilder.AppendFormat("[{0}-{1}]", selection.origin, selection.LastIndex);
+            }
+
+            return stringBuilder.ToString();
+        }
+
+        public struct SelectionRange
+        {
+            public int origin;
+            public int length;
+
+            public SelectionRange(int origin, int length)
+            {
+                this.origin = origin;
+                this.length = length;
+            }
+
+            public int LastIndex
+            {
+                get
+                {
+                    return origin + length - 1;
+                }
+            }
+        }
+    }
+
+    public class MoveTestConfiguration : TestConfiguration
+    {
+        public int offset;
+
+        public MoveTestConfiguration(SelectionRange[] selections, int offset) : base(selections)
+        {
+            this.offset = offset;
+        }
+
+        public override string ToString()
+        {
+            var stringBuilder = new StringBuilder();
+            if (selections.Length > 1)
+            {
+                stringBuilder.Append("multi-range");
+            }
+            else
+            {
+                stringBuilder.Append("range");
+            }
+
+            stringBuilder.Append(SelectionsToString());
+            stringBuilder.Append(" | ");
+
+            stringBuilder.AppendFormat("{0}[{1}]", (offset > 0) ? "right" : "left", offset);
+
+            return stringBuilder.ToString();
+        }
+    }
+
+    public class ResizeTestConfiguration : TestConfiguration
+    {
+        public int leftOffset;
+        public int rightOffset;
+
+        public ResizeTestConfiguration(SelectionRange[] selections, int leftOffset, int rightOffset) : base(selections)
+        {
+            this.leftOffset = leftOffset;
+            this.rightOffset = rightOffset;
+        }
+
+        public override string ToString()
+        {
+            var stringBuilder = new StringBuilder();
+            if (selections.Length > 1)
+            {
+                stringBuilder.Append("multi-range");
+            }
+            else
+            {
+                stringBuilder.Append("range");
+            }
+
+            stringBuilder.Append(SelectionsToString());
+            stringBuilder.Append(" | ");
+
+            bool hasLeftOffset = leftOffset != 0;
+            if (hasLeftOffset)
+            {
+                var leftAction = (leftOffset < 0) ? "grow-left" : "shrink-left";
+                stringBuilder.AppendFormat("{0}[{1}]", leftAction, leftOffset);
+            }
+
+            if (rightOffset != 0)
+            {
+                if (hasLeftOffset)
+                {
+                    stringBuilder.Append(" ");
+                }
+
+                var rightAction = (rightOffset > 0) ? "grow-right" : "shrink-right";
+                stringBuilder.AppendFormat("{0}[{1}]", rightAction, rightOffset);
+            }
+
+            return stringBuilder.ToString();
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/FrameTimeGraphSelectionTests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/FrameTimeGraphSelectionTests.cs.meta
new file mode 100644
index 0000000..a6d30c7
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/FrameTimeGraphSelectionTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3c21ce1fddf91fe4d972b23e8fe19d83
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MarkerDataAPITests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MarkerDataAPITests.cs
new file mode 100644
index 0000000..32ff75b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MarkerDataAPITests.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+
+public class MarkerDataAPITests : ProfileAnalyzerBaseTest
+{
+    [Test]
+    public void MarkerData_ComputeBuckets_GeneratesExpectedValues()
+    {
+        var marker = new MarkerData("Test Marker");
+        marker.presentOnFrameCount = 1;
+
+        for (int i = 0; i < 20; ++i)
+        {
+            var frameTime = new FrameTime(1, 1f * i, 1);
+            marker.frames.Add(frameTime);
+        }
+
+        marker.ComputeBuckets(0, 20);
+
+        for (int i = 1; i < marker.buckets.Length - 1; ++i)
+        {
+            Assert.IsTrue(1 == marker.buckets[i]);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MarkerDataAPITests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MarkerDataAPITests.cs.meta
new file mode 100644
index 0000000..3b24449
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MarkerDataAPITests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3cae35f26de9841808ffebd8ef49562e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MicrosecondsUnitsTest.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MicrosecondsUnitsTest.cs
new file mode 100644
index 0000000..8e2e28d
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MicrosecondsUnitsTest.cs
@@ -0,0 +1,136 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+using System.Collections.Generic;
+
+public class MicrosecondsUnitsFixture : UnitsTestFixture
+{
+    [SetUp]
+    public void SetupTest()
+    {
+        displayUnits = new DisplayUnits(Units.Microseconds);
+    }
+}
+
+public class MicrosecondsUnitsTest : MicrosecondsUnitsFixture
+{
+    static TestData[] DecimalLimitValues = new TestData[]
+    {
+        new TestData(0.000000001f,  "0.0"),
+        new TestData(0.00009f,      "0.1"),
+        new TestData(0.0004f,       "0.4"),
+        new TestData(0.0005f,       "0.5"),
+        new TestData(0.0112f,       "11.2"),
+        new TestData(0.0091f,       "9.1"),         // Show 1 decimal point for <100us
+        new TestData(0.1012f,       "101"),
+        new TestData(1.0012f,       "1001"),
+        new TestData(10.0012f,      "10001"),
+        new TestData(100.0012f,     "100001"),
+        new TestData(1000.0012f,    "1000001"),
+        new TestData(10000.0012f,   "10000000"),    // Only 6 sf valid
+        new TestData(100000.0012f,  "100000000"),
+    };
+
+    [Test]
+    public void DecimalLimit([ValueSource("DecimalLimitValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: false, limitToNDigits: 0, showFullValueWhenBelowZero: false);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] ShowFullValueWhenBelowZeroValues = new TestData[]
+    {
+        new TestData(0.000000001f,  "1E-06"),
+        new TestData(0.00009f,      "0.09"),
+        new TestData(0.0004f,       "0.4"),
+        new TestData(0.0005f,       "0.5"),
+        new TestData(0.0009f,       "0.9"),
+        new TestData(0.0015f,       "1.5"),
+        new TestData(0.0112f,       "11.2"),
+        new TestData(0.0959f,       "95.9"),
+        new TestData(0.1012f,       "101"),
+        new TestData(1.0012f,       "1001"),
+        new TestData(10.0012f,      "10001"),
+        new TestData(100.0012f,     "100001"),
+        new TestData(1000.0012f,    "1000001"),
+        new TestData(10000.0012f,   "10000000"),        // Only 6 sf valid
+        new TestData(100000.0012f,  "100000000"),
+    };
+
+    [Test]
+    public void ShowFullValueWhenBelowZero([ValueSource("ShowFullValueWhenBelowZeroValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: false, limitToNDigits: 0, showFullValueWhenBelowZero: true);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] WithUnitsValues = new TestData[]
+    {
+        new TestData(0.000000001f,  "0.0us"),
+        new TestData(0.00009f,      "0.1us"),
+        new TestData(0.0004f,       "0.4us"),
+        new TestData(0.0005f,       "0.5us"),
+        new TestData(0.0015f,       "1.5us"),
+        new TestData(0.0112f,       "11.2us"),
+        new TestData(0.1012f,       "101us"),
+        new TestData(1.0012f,       "1001us"),
+        new TestData(10.0012f,      "10001us"),
+        new TestData(100.0012f,     "100001us"),
+        new TestData(1000.0012f,    "1000001us"),
+        new TestData(10000.0012f,   "10000000us"),    // Only 6 sf valid
+        new TestData(100000.0012f,  "100000000us"),
+    };
+
+    [Test]
+    public void WithUnits([ValueSource("WithUnitsValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: true, limitToNDigits: 0, showFullValueWhenBelowZero: false);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] LimitedTo5DigitsValues = new TestData[]
+    {
+        new TestData(0.000000001f,  "0.0"),
+        new TestData(0.00009f,      "0.1"),
+        new TestData(0.0004f,       "0.4"),
+        new TestData(0.0005f,       "0.5"),
+        new TestData(0.0112f,       "11.2"),
+        new TestData(0.1012f,       "101"),
+        new TestData(1.0012f,       "1001"),
+        new TestData(10.0012f,      "10001"),
+        new TestData(100.0012f,     "100ms"),
+        new TestData(1000.0012f,    "1s"),
+        new TestData(10000.0012f,   "10s"),
+        new TestData(100000.0012f,  "100s"),
+    };
+
+    [Test]
+    public void LimitedTo5Digits([ValueSource("LimitedTo5DigitsValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: false, limitToNDigits: 5, showFullValueWhenBelowZero: false);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] WithUnitsLimitedTo5DigitsValuesAndShowFullValueWhenBelowZeroValues = new TestData[]
+    {
+        new TestData(0.000000001f,  "0.001ns"),
+        new TestData(0.00009f,      "0.09us"),
+        new TestData(0.0004f,       "0.4us"),
+        new TestData(0.0005f,       "0.5us"),
+        new TestData(0.0015f,       "1.5us"),
+        new TestData(0.0112f,       "11.2us"),
+        new TestData(0.1012f,       "101.2us"),
+        new TestData(1.0012f,       "1001.2us"),
+        new TestData(10.0012f,      "10001us"),
+        new TestData(100.0012f,     "100ms"),
+        new TestData(1000.0012f,    "1s"),
+        new TestData(10000.0012f,   "10s"),    // Only 6 sf valid
+        new TestData(100000.0012f,  "100s"),
+    };
+
+    [Test]
+    public void WithUnitsLimitedTo5DigitsAndShowFullValueWhenBelowZero([ValueSource("WithUnitsLimitedTo5DigitsValuesAndShowFullValueWhenBelowZeroValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: true, limitToNDigits: 5, showFullValueWhenBelowZero: true);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MicrosecondsUnitsTest.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MicrosecondsUnitsTest.cs.meta
new file mode 100644
index 0000000..7fcfae1
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MicrosecondsUnitsTest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3c2bbfa09badeb746b20e00a6d41da99
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MillisecondsUnitsTest.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MillisecondsUnitsTest.cs
new file mode 100644
index 0000000..7b26a0b
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MillisecondsUnitsTest.cs
@@ -0,0 +1,149 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+using System.Collections.Generic;
+
+public class MillisecondsUnitsFixture : UnitsTestFixture
+{
+    [SetUp]
+    public void SetupTest()
+    {
+        displayUnits = new DisplayUnits(Units.Milliseconds);
+    }
+}
+
+public class MillisecondsUnitsTest : MillisecondsUnitsFixture
+{
+    static TestData[] DecimalLimitValues = new TestData[]
+    {
+        new TestData(0.00000001f,   "0.00"),
+        new TestData(0.0009f,       "0.00"),
+        new TestData(0.004f,        "0.00"),
+        new TestData(0.005f,        "0.01"),
+        new TestData(0.1012f,       "0.10"),
+        new TestData(1.0012f,       "1.00"),
+        new TestData(10.0012f,      "10.00"),
+        new TestData(100.0012f,     "100.00"),
+        new TestData(1000.0012f,    "1000.00"),
+        new TestData(10000.0012f,   "10000.00"),
+        new TestData(100000.0012f,  "100000.00"),
+    };
+
+    [Test]
+    public void DecimalLimit([ValueSource("DecimalLimitValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: false, limitToNDigits: 0, showFullValueWhenBelowZero: false);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] ShowFullValueWhenBelowZeroValues = new TestData[]
+    {
+        new TestData(0.00000001f,   "1E-08"),
+        new TestData(0.0009f,       "0.0009"),
+        new TestData(0.004f,        "0.004"),
+        new TestData(0.005f,        "0.005"),
+        new TestData(0.01f,         "0.01"),
+        new TestData(0.015f,        "0.02"),
+        new TestData(0.1012f,       "0.10"),
+        new TestData(1.0012f,       "1.00"),
+        new TestData(10.0012f,      "10.00"),
+        new TestData(100.0012f,     "100.00"),
+        new TestData(1000.0012f,    "1000.00"),
+        new TestData(10000.0012f,   "10000.00"),
+        new TestData(100000.0012f,  "100000.00"),
+    };
+
+    [Test]
+    public void ShowFullValueWhenBelowZero([ValueSource("ShowFullValueWhenBelowZeroValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: false, limitToNDigits: 0, showFullValueWhenBelowZero: true);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] ShowUnitsValues = new TestData[]
+    {
+        new TestData(0.00000001f,   "0.00ms"),
+        new TestData(0.0009f,       "0.00ms"),
+        new TestData(0.004f,        "0.00ms"),
+        new TestData(0.005f,        "0.01ms"),
+        new TestData(0.1012f,       "0.10ms"),
+        new TestData(1.0012f,       "1.00ms"),
+        new TestData(10.0012f,      "10.00ms"),
+        new TestData(100.0012f,     "100.00ms"),
+        new TestData(1000.0012f,    "1000.00ms"),
+        new TestData(10000.0012f,   "10000.00ms"),
+        new TestData(100000.0012f,  "100000.00ms"),
+    };
+
+    [Test]
+    public void ShowUnits([ValueSource("ShowUnitsValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: true, limitToNDigits: 0, showFullValueWhenBelowZero: false);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] LimitedTo5DigitsValues = new TestData[]
+    {
+        new TestData(0.00000001f,   "0.00"),
+        new TestData(0.0009f,       "0.00"),
+        new TestData(0.004f,        "0.00"),
+        new TestData(0.005f,        "0.01"),
+        new TestData(0.1012f,       "0.10"),
+        new TestData(1.0012f,       "1.00"),
+        new TestData(10.0012f,      "10.00"),
+        new TestData(100.0012f,     "100.00"),
+        new TestData(1000.0012f,    "1000.0"),
+        new TestData(10000.0012f,   "10000"),
+        new TestData(100000.0012f,  "100s"),
+    };
+
+    [Test]
+    public void LimitedTo5Digits([ValueSource("LimitedTo5DigitsValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: false, limitToNDigits: 5, showFullValueWhenBelowZero: false);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] WithUnitsLimitedTo5DigitsValues = new TestData[]
+    {
+        new TestData(0.00000001f,   "0.00ms"),
+        new TestData(0.0009f,       "0.00ms"),
+        new TestData(0.004f,        "0.00ms"),
+        new TestData(0.005f,        "0.01ms"),
+        new TestData(0.1012f,       "0.10ms"),
+        new TestData(1.0012f,       "1.00ms"),
+        new TestData(10.0012f,      "10.0ms"),
+        new TestData(100.0012f,     "100ms"),
+        new TestData(1000.0012f,    "1.00s"),
+        new TestData(10000.0012f,   "10.0s"),
+        new TestData(100000.0012f,  "100s"),
+    };
+
+    [Test]
+    public void WithUnitsLimitedTo5Digits([ValueSource("WithUnitsLimitedTo5DigitsValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: true, limitToNDigits: 5, showFullValueWhenBelowZero: false);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+
+    static TestData[] WithUnitsLimitedTo5DigitsValuesAndShowFullValueWhenBelowZeroValues = new TestData[]
+    {
+        new TestData(0.00000001f,   "0.01ns"),
+        new TestData(0.0009f,       "0.90us"),
+        new TestData(0.004f,        "4.00us"),
+        new TestData(0.005f,        "5.00us"),
+        new TestData(0.1012f,       "0.1012ms"),
+        new TestData(1.0012f,       "1.0012ms"),
+        new TestData(10.0012f,      "10.001ms"),
+        new TestData(100.0012f,     "100.00ms"),
+        new TestData(1000.0012f,    "1000.0ms"),
+        new TestData(10000.0012f,   "10000ms"),
+        new TestData(100000.0012f,  "100.00s"),
+    };
+
+    [Test]
+    public void WithUnitsLimitedTo5DigitsAndShowFullValueWhenBelowZero([ValueSource("WithUnitsLimitedTo5DigitsValuesAndShowFullValueWhenBelowZeroValues")] TestData testData)
+    {
+        string output = displayUnits.ToString(testData.value, showUnits: true, limitToNDigits: 5, showFullValueWhenBelowZero: true);
+        Assert.AreEqual(testData.expectedOutput, output);
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MillisecondsUnitsTest.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MillisecondsUnitsTest.cs.meta
new file mode 100644
index 0000000..62576df
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/MillisecondsUnitsTest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ced04708ef2075944bfd2ab9cf8e95a2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalysisAPITests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalysisAPITests.cs
new file mode 100644
index 0000000..600f4aa
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalysisAPITests.cs
@@ -0,0 +1,143 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+using UnityEngine;
+
+public class ProfileAnalysisAPITests : ProfileAnalyzerBaseTest
+{
+    [Test]
+    public void ProfileAnalysis_SetRange_ModifiesFirstLastIndices([Values(0, 2)] int first, [Values(150, 300)] int last)
+    {
+        var analysis = new ProfileAnalysis();
+        analysis.SetRange(first, last);
+
+        Assert.IsTrue(first == analysis.GetFrameSummary().first);
+        Assert.IsTrue(first == analysis.GetFrameSummary().minFrameIndex);
+        Assert.IsTrue(first == analysis.GetFrameSummary().maxFrameIndex);
+        Assert.IsTrue(last == analysis.GetFrameSummary().last);
+    }
+
+    [Test]
+    public void ProfileAnalysis_UpdateSummary_AddsFramesToSummary()
+    {
+        var analysis = new ProfileAnalysis();
+        var frameSummary = analysis.GetFrameSummary();
+
+        Assert.IsTrue(0 == frameSummary.frames.Count);
+
+        analysis.UpdateSummary(0, 0.1f);
+
+        Assert.IsTrue(1 == frameSummary.frames.Count);
+    }
+
+    [Test]
+    public void ProfileAnalysis_SetupMarkers_GeneratesExpectedValues()
+    {
+        var analysis = new ProfileAnalysis();
+
+        var marker = new MarkerData("Test Marker");
+        marker.presentOnFrameCount = 1;
+
+        for (int i = 0; i < 10; ++i)
+        {
+            var frameTime = new FrameTime(i, 0.1f * i, 1);
+            marker.frames.Add(frameTime);
+        }
+
+        analysis.AddMarker(marker);
+        analysis.SetupMarkers();
+
+        Assert.IsTrue(marker.count == 0);
+        Assert.IsTrue(marker.firstFrameIndex == -1);
+        Assert.IsTrue(marker.frames.Count == 10);
+        Assert.IsTrue(marker.lastFrame == -1);
+        Assert.IsTrue(marker.maxDepth == 0);
+        Assert.IsTrue(marker.maxFrameIndex == 9);
+        Assert.IsTrue(marker.maxIndividualFrameIndex == 0);
+        Assert.IsTrue(marker.medianFrameIndex == 4);
+        Assert.IsTrue(marker.minDepth == 0);
+        Assert.IsTrue(marker.minFrameIndex == 0);
+        Assert.IsTrue(marker.minIndividualFrameIndex == 0);
+        Assert.IsTrue(marker.msAtMedian == 0);
+        Assert.IsTrue(marker.msMean == 0);
+        Assert.IsTrue(marker.msMinIndividual == float.MaxValue);
+        Assert.IsTrue(marker.msMaxIndividual == float.MinValue);
+        Assert.IsTrue(marker.msMin == 0);
+        Assert.IsTrue(marker.msTotal == 0);
+        Assert.IsTrue(marker.name == "Test Marker");
+        Assert.IsTrue(marker.presentOnFrameCount == 1);
+
+        //Handle floats "approximately"
+        Assert.IsTrue(Mathf.Approximately(marker.msLowerQuartile, 0.2f));
+        Assert.IsTrue(Mathf.Approximately(marker.msMax, 0.9f));
+        Assert.IsTrue(Mathf.Approximately(marker.msUpperQuartile, 0.6f));
+        Assert.IsTrue(Mathf.Approximately(marker.msMedian, 0.4f));
+    }
+
+    [Test]
+    public void ProfileAnalysis_SetupMarkerBuckets_GeneratesExpectedValues()
+    {
+        var analysis = new ProfileAnalysis();
+
+        var marker = new MarkerData("Test Marker");
+        marker.presentOnFrameCount = 1;
+
+        int range = 10;
+        float offset = 0.000001f; // Without the offset rounding errors can shift a value into the preceeding bucket
+        for (int i = 0; i <= range; ++i)
+        {
+            float value = ((float)i / (float)range);
+            if (i != 0 && i != range)
+                value += offset;
+            var frameTime = new FrameTime(i, value, 1);
+            marker.frames.Add(frameTime);
+        }
+
+        analysis.AddMarker(marker);
+        analysis.SetupMarkers();
+        analysis.SetupMarkerBuckets();
+
+        Assert.IsTrue(marker.buckets[0] == 1);
+        Assert.IsTrue(marker.buckets[1] == 0);
+        Assert.IsTrue(marker.buckets[2] == 1);
+        Assert.IsTrue(marker.buckets[3] == 0);
+        Assert.IsTrue(marker.buckets[4] == 1);
+        Assert.IsTrue(marker.buckets[5] == 0);
+        Assert.IsTrue(marker.buckets[6] == 1);
+        Assert.IsTrue(marker.buckets[7] == 0);
+        Assert.IsTrue(marker.buckets[8] == 1);
+        Assert.IsTrue(marker.buckets[9] == 0);
+        Assert.IsTrue(marker.buckets[10] == 1);
+        Assert.IsTrue(marker.buckets[11] == 0);
+        Assert.IsTrue(marker.buckets[12] == 1);
+        Assert.IsTrue(marker.buckets[13] == 0);
+        Assert.IsTrue(marker.buckets[14] == 1);
+        Assert.IsTrue(marker.buckets[15] == 0);
+        Assert.IsTrue(marker.buckets[16] == 1);
+        Assert.IsTrue(marker.buckets[17] == 0);
+        Assert.IsTrue(marker.buckets[18] == 1);
+        Assert.IsTrue(marker.buckets[19] == 1); // max value would fall into the next bucket but is clamped to here.
+    }
+
+    [Test]
+    public void ProfileAnalysis_SetupFrameBuckets_GeneratesExpectedValues()
+    {
+        var analysis = new ProfileAnalysis();
+
+        var marker = new MarkerData("Test Marker");
+        marker.presentOnFrameCount = 1;
+
+        for (int i = 0; i < 20; ++i)
+        {
+            analysis.UpdateSummary(i, 1.0f * i);
+        }
+
+        analysis.SetupFrameBuckets(20);
+
+        var summary = analysis.GetFrameSummary();
+
+        for (int i = 0; i < summary.buckets.Length; ++i)
+        {
+            Assert.IsTrue(1 == summary.buckets[i]);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalysisAPITests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalysisAPITests.cs.meta
new file mode 100644
index 0000000..8bc6efb
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalysisAPITests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 30fff51cfbcd14354a89a347d5f6fc24
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerAPITests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerAPITests.cs
new file mode 100644
index 0000000..f35779a
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerAPITests.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+
+public class ProfileAnalyzerAPITests : ProfileAnalyzerBaseTest
+{
+    [Test]
+    public void ProfileAnalyzer_EmptyAnalysis_HasNoThreads()
+    {
+        var analyzer = m_SetupData.analyzer;
+        Assert.IsTrue(0 == analyzer.GetThreadNames().Count);
+    }
+
+    [Test]
+    public void ProfileAnalyzer_EmptyAnalysis_HasNoProgress()
+    {
+        var analyzer = m_SetupData.analyzer;
+        Assert.IsTrue(0 == analyzer.GetProgress());
+    }
+
+    [Test]
+    public void ProfileAnalyzer_EmptyAnalysis_ReturnsNullForAnalysis()
+    {
+        var analysis = GetAnalysisFromFrameData(null);
+        Assert.IsNull(analysis);
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerAPITests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerAPITests.cs.meta
new file mode 100644
index 0000000..ac49ad3
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerAPITests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 96b02e3d30e7c4599bf30551388c053b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerBaseTest.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerBaseTest.cs
new file mode 100644
index 0000000..1050f13
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerBaseTest.cs
@@ -0,0 +1,81 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+using UnityEditor;
+using UnityEditorInternal;
+using System.Collections.Generic;
+
+public class ProfileAnalyzerBaseTest
+{
+    protected struct FrameSetupData
+    {
+        internal ProgressBarDisplay progressBar;
+        internal ProfileAnalyzer analyzer;
+        internal ProfilerWindowInterface profilerWindowInterface;
+        internal ProfileData profileData;
+        internal int depthFilter;
+        internal List<string> threadFilters;
+        internal int firstFrame;
+        internal int lastFrame;
+        internal FrameSetupData(int minFrame, int maxFrame, int filterDepth, List<string> filterThreads)
+        {
+            progressBar = new ProgressBarDisplay();
+            firstFrame = minFrame;
+            lastFrame = maxFrame;
+            analyzer = new ProfileAnalyzer();
+            profilerWindowInterface = new ProfilerWindowInterface(progressBar);
+            profileData = profilerWindowInterface.PullFromProfiler(minFrame, maxFrame);
+            depthFilter = filterDepth;
+            threadFilters = filterThreads;
+        }
+    };
+
+    protected FrameSetupData m_SetupData;
+
+    [SetUp]
+    public void SetupTest()
+    {
+        ProfilerDriver.ClearAllFrames();
+        m_SetupData = new FrameSetupData(1, 300, -1, new List<string> { "1:Main Thread" });
+    }
+
+    [TearDown]
+    public void TearDownTest()
+    {
+    }
+
+    List<int> SelectRange(int startIndex, int endIndex)
+    {
+        List<int> list = new List<int>();
+        for (int c = startIndex; c <= endIndex; c++)
+        {
+            list.Add(c);
+        }
+
+        return list;
+    }
+
+    internal ProfileAnalysis GetAnalysisFromFrameData(ProfileData profileData)
+    {
+        return m_SetupData.analyzer.Analyze(profileData,
+            SelectRange(m_SetupData.firstFrame, m_SetupData.lastFrame),
+            m_SetupData.threadFilters,
+            m_SetupData.depthFilter);
+    }
+
+    protected void StartProfiler()
+    {
+#if UNITY_2017_1_OR_NEWER
+        ProfilerDriver.enabled = true;
+#endif
+        ProfilerDriver.profileEditor = true;
+    }
+
+    protected void StopProfiler()
+    {
+        EditorApplication.isPlaying = false;
+#if UNITY_2017_1_OR_NEWER
+        ProfilerDriver.enabled = false;
+#endif
+        ProfilerDriver.profileEditor = false;
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerBaseTest.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerBaseTest.cs.meta
new file mode 100644
index 0000000..92c6a9f
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerBaseTest.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 15e793ef718504da48ec583556c5e284
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerCaptureTests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerCaptureTests.cs
new file mode 100644
index 0000000..91af322
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerCaptureTests.cs
@@ -0,0 +1,48 @@
+using NUnit.Framework;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.TestTools;
+using UnityEditor;
+using UnityEditorInternal;
+public class ProfileAnalyzerCaptureTests : ProfileAnalyzerBaseTest
+{
+    [UnityTest]
+    public IEnumerator PlayMode_Capture_ContainsNoDuplicates()
+    {
+        StartProfiler();
+
+        yield return null;
+        yield return null;
+        yield return null;
+        yield return null;
+        yield return null;
+
+        StopProfiler();
+
+        // Seem to need one more frame to get the data transfered over so the profile analyzer can pull it.
+        yield return null;
+
+        //analyze the data
+        m_SetupData.profileData = m_SetupData.profilerWindowInterface.PullFromProfiler(m_SetupData.firstFrame, m_SetupData.lastFrame);
+        var analysis = GetAnalysisFromFrameData(m_SetupData.profileData);
+
+        var analysisMarkers = analysis.GetMarkers();
+        var analysisMarkerDict = new Dictionary<string, int>();
+        for (int i = 0; i < analysisMarkers.Count; ++i)
+        {
+            int count = 0;
+            string curName = analysisMarkers[i].name;
+
+            analysisMarkerDict.TryGetValue(curName, out count);
+
+            analysisMarkerDict[curName] = count + 1;
+        }
+
+        Assert.IsTrue(0 != analysisMarkerDict.Count, "analysisMarkerSet count is zero!");
+
+        foreach (var entry in analysisMarkerDict)
+        {
+            Assert.IsTrue(1 == entry.Value, "Duplicates found in analysis marker list: " + entry.Key);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerCaptureTests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerCaptureTests.cs.meta
new file mode 100644
index 0000000..4293b2d
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerCaptureTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: afac56376261b4bd093a5a46f7c0c6d1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerEmptyTests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerEmptyTests.cs
new file mode 100644
index 0000000..4a05d64
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerEmptyTests.cs
@@ -0,0 +1,62 @@
+using NUnit.Framework;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ProfileAnalyzerEmptyTests : ProfileAnalyzerBaseTest
+{
+    List<int> SelectRange(int startIndex, int endIndex)
+    {
+        List<int> list = new List<int>();
+        for (int c = startIndex; c <= endIndex; c++)
+        {
+            list.Add(c);
+        }
+
+        return list;
+    }
+
+    [Test]
+    public void ProfileAnalyzer_EmptyData_IsEmpty()
+    {
+        int k_FirstFrameInProfiler = 1;
+        int k_LastFrameInProfiler = 300;
+        int k_FrameCountInProfiler = k_LastFrameInProfiler - k_FirstFrameInProfiler + 1;
+        // the first and last frame are incomplete (empty) and therefore removed from the frame count of the loaded data in Profile Analyzer
+        int k_FrameCountInProfileAnalyzer = k_FrameCountInProfiler - 2;
+        // The first frame is invalid,
+        int k_FirstValidFrameInProfiler = k_FirstFrameInProfiler + 1;
+        // the first frame being missing is adjusted for via the frame offset, so only the last frame needs to be trimmed in
+        int k_LastFrameInProfileAnalyzer = k_LastFrameInProfiler - 1;
+
+        var analyzer = m_SetupData.analyzer;
+        var profileData = m_SetupData.profilerWindowInterface.PullFromProfiler(k_FirstFrameInProfiler, k_LastFrameInProfiler);
+        var depthFilter = m_SetupData.depthFilter;
+        var threadFilters = m_SetupData.threadFilters;
+
+        int firstFrameIndex = profileData.OffsetToDisplayFrame(0);
+        int lastFrameIndex  = profileData.OffsetToDisplayFrame(profileData.GetFrameCount() - 1);
+
+        Assert.AreEqual(k_FirstValidFrameInProfiler, firstFrameIndex, "First Frame index not " + k_FirstValidFrameInProfiler);
+        Assert.AreEqual(k_LastFrameInProfileAnalyzer, lastFrameIndex, "Last Frame index is not " + k_LastFrameInProfileAnalyzer);
+
+        var analysis = analyzer.Analyze(profileData, SelectRange(firstFrameIndex, lastFrameIndex), threadFilters, depthFilter);
+        var frameSummary = analysis.GetFrameSummary();
+
+        Assert.AreEqual(0, analysis.GetThreads().Count);
+        Assert.AreEqual(0, frameSummary.msTotal);
+        Assert.AreEqual(k_FirstValidFrameInProfiler, frameSummary.first);
+        Assert.AreEqual(k_LastFrameInProfileAnalyzer, frameSummary.last);
+        Assert.AreEqual(k_FrameCountInProfileAnalyzer, frameSummary.count);
+        Assert.AreEqual(0, frameSummary.msMean);
+        Assert.AreEqual(0, frameSummary.msMedian);
+        Assert.AreEqual(0, frameSummary.msLowerQuartile);
+        Assert.AreEqual(0, frameSummary.msUpperQuartile);
+        Assert.AreEqual(0, frameSummary.msMin);
+        Assert.AreEqual(0, frameSummary.msMax);
+        Assert.AreEqual(Mathf.RoundToInt((float)(k_LastFrameInProfileAnalyzer + 0.1f) / 2.0f), frameSummary.medianFrameIndex);
+        Assert.AreEqual(k_FirstValidFrameInProfiler, frameSummary.minFrameIndex);
+        Assert.AreEqual(k_FirstValidFrameInProfiler, frameSummary.maxFrameIndex);
+        Assert.AreEqual(0, frameSummary.maxMarkerDepth);
+        Assert.AreEqual(0, frameSummary.totalMarkers);
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerEmptyTests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerEmptyTests.cs.meta
new file mode 100644
index 0000000..f667d09
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileAnalyzerEmptyTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: df8088010ce864bf5b2342f7d6a5803c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataAPITests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataAPITests.cs
new file mode 100644
index 0000000..ab257c8
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataAPITests.cs
@@ -0,0 +1,84 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+using System.Collections.Generic;
+
+public class ProfileDataAPITests : ProfileAnalyzerBaseTest
+{
+    [Test]
+    public void ProfileData_AddMarkerName_AddsMarkerAndContainsName()
+    {
+        var data = new ProfileData();
+        var markerNames = new List<string>()
+        {
+            "Marker01",
+            "Marker02",
+            "Marker03",
+            "Marker04"
+        };
+
+        var markerList = new List<ProfileMarker>();
+        for (int i = 0; i < 10; ++i)
+        {
+            var marker = new ProfileMarker()
+            {
+                msMarkerTotal = 0.5f,
+                depth = i
+            };
+
+            int expectedIndex = i % markerNames.Count;
+            data.AddMarkerName(markerNames[expectedIndex], marker);
+            markerList.Add(marker);
+
+            Assert.IsTrue(expectedIndex == marker.nameIndex, "Index mismatch at: " + i + " , " + marker.nameIndex);;
+        }
+
+        for (int i = 0; i < markerList.Count; ++i)
+        {
+            var curName = data.GetMarkerName(markerList[i]);
+            Assert.IsTrue(markerNames.Contains(curName));
+        }
+    }
+
+    [Test]
+    public void ProfileData_AddThreadName_AddsThreadAndContainsName()
+    {
+        var data = new ProfileData();
+        var threadNames = new List<string>()
+        {
+            "Thread01",
+            "Thread02",
+            "Thread03",
+            "Thread04"
+        };
+
+        var threadDict = new Dictionary<string, ProfileThread>();
+        for (int i = 0; i < 10; ++i)
+        {
+            int expectedIndex = i % threadNames.Count;
+            string threadName = threadNames[expectedIndex];
+            ProfileThread thread;
+
+            if (!threadDict.TryGetValue(threadName, out thread))
+            {
+                thread = new ProfileThread();
+                threadDict.Add(threadName, thread);
+            }
+
+            var marker = new ProfileMarker()
+            {
+                msMarkerTotal = 0.5f,
+                depth = i
+            };
+
+            thread.markers.Add(marker);
+            data.AddThreadName(threadName, thread);
+            Assert.IsTrue(expectedIndex == thread.threadIndex, "Index mismatch at: " + i + " , " + thread.threadIndex);;
+        }
+
+        foreach (var curThread in threadDict)
+        {
+            var curName = data.GetThreadName(curThread.Value);
+            Assert.IsTrue(threadNames.Contains(curName));
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataAPITests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataAPITests.cs.meta
new file mode 100644
index 0000000..a2d7de1
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataAPITests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 542691619c7a540408193902ae073a51
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataTests.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataTests.cs
new file mode 100644
index 0000000..c8435da
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataTests.cs
@@ -0,0 +1,38 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+
+public class ProfileDataTests
+{
+    [Test]
+    public void Save_WithNullData_ReturnsFalse()
+    {
+        var filename = "filename.pdata";
+        ProfileData nullProfileData = null;
+
+        bool success = ProfileData.Save(filename, nullProfileData);
+
+        Assert.IsFalse(success, "Calling ProfileData.Save with null data should return false.");
+    }
+
+    [Test]
+    public void Save_WithNullFilename_ReturnsFalse()
+    {
+        string filename = null;
+        var profileData = new ProfileData();
+
+        bool success = ProfileData.Save(filename, profileData);
+
+        Assert.IsFalse(success, "Calling ProfileData.Save with a null filename should return false.");
+    }
+
+    [Test]
+    public void Save_WithEmptyFilename_ReturnsFalse()
+    {
+        string filename = string.Empty;
+        var profileData = new ProfileData();
+
+        bool success = ProfileData.Save(filename, profileData);
+
+        Assert.IsFalse(success, "Calling ProfileData.Save with an empty filename should return false.");
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataTests.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataTests.cs.meta
new file mode 100644
index 0000000..1f60d08
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/ProfileDataTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e1751800eb256f54f81cc0f9c81c6cc7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/UnitsTestFixture.cs b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/UnitsTestFixture.cs
new file mode 100644
index 0000000..58e3ed6
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/UnitsTestFixture.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UnityEditor.Performance.ProfileAnalyzer;
+using System.Collections.Generic;
+
+public class UnitsTestFixture
+{
+    internal DisplayUnits displayUnits;
+
+    public struct TestData
+    {
+        public readonly float value;
+        public readonly string expectedOutput;
+
+        public TestData(float value, string expectedOutput)
+        {
+            this.value = value;
+            this.expectedOutput = expectedOutput;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("{0} becomes {1}", value, expectedOutput);
+        }
+    }
+}
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/UnitsTestFixture.cs.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/UnitsTestFixture.cs.meta
new file mode 100644
index 0000000..011277e
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/UnitsTestFixture.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 52c7ca0f6ab0a464883f39201b038df6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/Unity.Performance.Profile-Analyzer.EditorTests.asmdef b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/Unity.Performance.Profile-Analyzer.EditorTests.asmdef
new file mode 100644
index 0000000..b1d93b8
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/Unity.Performance.Profile-Analyzer.EditorTests.asmdef
@@ -0,0 +1,22 @@
+{
+    "name": "Unity.Performance.Profile-Analyzer.EditorTests",
+    "references": [
+        "Unity.Performance.Profile-Analyzer.Editor"
+    ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+	"defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": []
+}
\ No newline at end of file
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/Unity.Performance.Profile-Analyzer.EditorTests.asmdef.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/Unity.Performance.Profile-Analyzer.EditorTests.asmdef.meta
new file mode 100644
index 0000000..61641b8
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/Tests/Editor/Unity.Performance.Profile-Analyzer.EditorTests.asmdef.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 97505fd80b553409c995f274ad2a533b
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/package.json b/Packages/com.unity.performance.profile-analyzer@1.2.4/package.json
new file mode 100644
index 0000000..59db53c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/package.json
@@ -0,0 +1 @@
+{"name":"com.unity.performance.profile-analyzer","displayName":"Profile Analyzer","version":"1.2.4","description":"The Profile Analyzer tool supports the standard Unity Profiler. You can use it to analyze multiple frames and multiple data sets of the CPU data in the Profiler.\n\nMain features: \n▪ Multi-frame analysis of a single set of Profiler CPU data \n▪ Comparison of two multi-frame profile scans \n\n","unity":"2020.3","dependencies":{},"_upm":{"changelog":"### Fixed\n\n* Fixed minimum supported version in documentation.\n* Fixed PROFB-199; Unchecking 'Hide Removed Markers' doesn't work."},"upmCi":{"footprint":"d79e16167f5d8d452ace6ad23470b78fcfd41d08"},"documentationUrl":"https://docs.unity3d.com/Packages/com.unity.performance.profile-analyzer@1.2/manual/index.html","repository":{"url":"https://github.cds.internal.unity3d.com/unity/com.unity.performance.profile-analyzer.git","type":"git","revision":"835e61d94bd201d0dea5763dff75e86b6b61de29"}}
\ No newline at end of file
diff --git a/Packages/com.unity.performance.profile-analyzer@1.2.4/package.json.meta b/Packages/com.unity.performance.profile-analyzer@1.2.4/package.json.meta
new file mode 100644
index 0000000..f69bf4c
--- /dev/null
+++ b/Packages/com.unity.performance.profile-analyzer@1.2.4/package.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 478e38cbe30254f8c868840b4e2f32e1
+PackageManifestImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/ShaderLibrary/SurfaceInput.hlsl b/Packages/com.unity.render-pipelines.universal@14.0.11/ShaderLibrary/SurfaceInput.hlsl
index 3704b50..3df0faf 100644
--- a/Packages/com.unity.render-pipelines.universal@14.0.11/ShaderLibrary/SurfaceInput.hlsl
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/ShaderLibrary/SurfaceInput.hlsl
@@ -5,7 +5,7 @@
 #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceData.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl"
 #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonMaterial.hlsl"
-
+#ifndef LIT_ARRAY
 TEXTURE2D(_BaseMap);
 SAMPLER(sampler_BaseMap);
 float4 _BaseMap_TexelSize;
@@ -58,5 +58,58 @@ half3 SampleEmission(float2 uv, half3 emissionColor, TEXTURE2D_PARAM(emissionMap
     return SAMPLE_TEXTURE2D(emissionMap, sampler_emissionMap, uv).rgb * emissionColor;
 #endif
 }
+#else
+TEXTURE2D_ARRAY(_BaseMap);
+SAMPLER(sampler_BaseMap);
+float4 _BaseMap_TexelSize;
+float4 _BaseMap_MipInfo;
+TEXTURE2D_ARRAY(_BumpMap);
+SAMPLER(sampler_BumpMap);
+TEXTURE2D_ARRAY(_EmissionMap);
+SAMPLER(sampler_EmissionMap);
 
+///////////////////////////////////////////////////////////////////////////////
+//                      Material Property Helpers                            //
+///////////////////////////////////////////////////////////////////////////////
+half Alpha(half albedoAlpha, half4 color, half cutoff)
+{
+    #if !defined(_SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A) && !defined(_GLOSSINESS_FROM_BASE_ALPHA)
+    half alpha = albedoAlpha * color.a;
+    #else
+    half alpha = color.a;
+    #endif
+
+    alpha = AlphaDiscard(alpha, cutoff);
+
+    return alpha;
+}
+
+half4 SampleAlbedoAlpha(float2 uv, int slice, TEXTURE2D_ARRAY_PARAM(albedoAlphaMap, sampler_albedoAlphaMap))
+{
+    return half4(SAMPLE_TEXTURE2D_ARRAY(albedoAlphaMap, sampler_albedoAlphaMap, uv, slice));
+}
+
+half3 SampleNormal(float2 uv, int slice, TEXTURE2D_ARRAY_PARAM(bumpMap, sampler_bumpMap), half scale = half(1.0))
+{
+    #ifdef _NORMALMAP
+    half4 n = SAMPLE_TEXTURE2D_ARRAY(bumpMap, sampler_bumpMap, uv, slice);
+    #if BUMP_SCALE_NOT_SUPPORTED
+    return UnpackNormal(n);
+    #else
+    return UnpackNormalScale(n, scale);
+    #endif
+    #else
+    return half3(0.0h, 0.0h, 1.0h);
+    #endif
+}
+
+half3 SampleEmission(float2 uv, int slice, half3 emissionColor, TEXTURE2D_ARRAY_PARAM(emissionMap, sampler_emissionMap))
+{
+    #ifndef _EMISSION
+    return 0;
+    #else
+    return SAMPLE_TEXTURE2D_ARRAY(emissionMap, sampler_emissionMap, uv, slice).rgb * emissionColor;
+    #endif
+}
+#endif
 #endif
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader
index 40a2a06..27e01d4 100644
--- a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/Lit.shader
@@ -172,7 +172,7 @@ Shader "Universal Render Pipeline/Lit"
             #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/CapsuleShadow.hlsl"
 
             #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
-            #pragma enable_d3d11_debug_symbols
+            // #pragma enable_d3d11_debug_symbols
             #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
             #include "Packages/com.unity.render-pipelines.universal/Shaders/LitForwardPass.hlsl"
 
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArray.shader b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArray.shader
new file mode 100644
index 0000000..7be0c1b
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArray.shader
@@ -0,0 +1,451 @@
+Shader "Universal Render Pipeline/LitArray"
+{
+    Properties
+    {
+        // Specular vs Metallic workflow
+        _WorkflowMode("WorkflowMode", Float) = 1.0
+
+        [MainTexture] _BaseMap("Albedo", 2darray) = "white" {}
+        [MainColor] _BaseColor("Color", Color) = (1,1,1,1)
+
+        _Cutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
+
+        _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
+        _SmoothnessTextureChannel("Smoothness texture channel", Float) = 0
+
+        _Metallic("Metallic", Range(0.0, 1.0)) = 0.0
+        _MetallicGlossMap("Metallic", 2darray) = "white" {}
+
+        _SpecColor("Specular", Color) = (0.2, 0.2, 0.2)
+        _SpecGlossMap("Specular", 2D) = "white" {}
+
+        [ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 1.0
+        [ToggleOff] _EnvironmentReflections("Environment Reflections", Float) = 1.0
+
+        _BumpScale("Scale", Float) = 1.0
+        _BumpMap("Normal Map", 2darray) = "bump" {}
+
+        _Parallax("Scale", Range(0.005, 0.08)) = 0.005
+        _ParallaxMap("Height Map", 2D) = "black" {}
+
+        _OcclusionStrength("Strength", Range(0.0, 1.0)) = 1.0
+        _OcclusionMap("Occlusion", 2darray) = "white" {}
+
+        [HDR] _EmissionColor("Color", Color) = (0,0,0)
+        _EmissionMap("Emission", 2D) = "white" {}
+
+        _DetailMask("Detail Mask", 2D) = "white" {}
+        _DetailAlbedoMapScale("Scale", Range(0.0, 2.0)) = 1.0
+        _DetailAlbedoMap("Detail Albedo x2", 2D) = "linearGrey" {}
+        _DetailNormalMapScale("Scale", Range(0.0, 2.0)) = 1.0
+        [Normal] _DetailNormalMap("Normal Map", 2D) = "bump" {}
+
+        // SRP batching compatibility for Clear Coat (Not used in Lit)
+        [HideInInspector] _ClearCoatMask("_ClearCoatMask", Float) = 0.0
+        [HideInInspector] _ClearCoatSmoothness("_ClearCoatSmoothness", Float) = 0.0
+
+        // Blending state
+        _Surface("__surface", Float) = 0.0
+        _Blend("__blend", Float) = 0.0
+        _Cull("__cull", Float) = 2.0
+        [ToggleUI] _AlphaClip("__clip", Float) = 0.0
+        [HideInInspector] _SrcBlend("__src", Float) = 1.0
+        [HideInInspector] _DstBlend("__dst", Float) = 0.0
+        [HideInInspector] _SrcBlendAlpha("__srcA", Float) = 1.0
+        [HideInInspector] _DstBlendAlpha("__dstA", Float) = 0.0
+        [HideInInspector] _ZWrite("__zw", Float) = 1.0
+        [HideInInspector] _BlendModePreserveSpecular("_BlendModePreserveSpecular", Float) = 1.0
+        [HideInInspector] _AlphaToMask("__alphaToMask", Float) = 0.0
+
+        [ToggleUI] _ReceiveShadows("Receive Shadows", Float) = 1.0
+        // Editmode props
+        _QueueOffset("Queue offset", Float) = 0.0
+
+        // ObsoleteProperties
+        [HideInInspector] _MainTex("BaseMap", 2D) = "white" {}
+        [HideInInspector] _Color("Base Color", Color) = (1, 1, 1, 1)
+        [HideInInspector] _GlossMapScale("Smoothness", Float) = 0.0
+        [HideInInspector] _Glossiness("Smoothness", Float) = 0.0
+        [HideInInspector] _GlossyReflections("EnvironmentReflections", Float) = 0.0
+
+        [HideInInspector][NoScaleOffset]unity_Lightmaps("unity_Lightmaps", 2DArray) = "" {}
+        [HideInInspector][NoScaleOffset]unity_LightmapsInd("unity_LightmapsInd", 2DArray) = "" {}
+        [HideInInspector][NoScaleOffset]unity_ShadowMasks("unity_ShadowMasks", 2DArray) = "" {}
+    }
+
+    SubShader
+    {
+        // Universal Pipeline tag is required. If Universal render pipeline is not set in the graphics settings
+        // this Subshader will fail. One can add a subshader below or fallback to Standard built-in to make this
+        // material work with both Universal Render Pipeline and Builtin Unity Pipeline
+        Tags
+        {
+            "RenderType" = "Opaque"
+            "RenderPipeline" = "UniversalPipeline"
+            "UniversalMaterialType" = "Lit"
+            "IgnoreProjector" = "True"
+        }
+        LOD 300
+
+        // ------------------------------------------------------------------
+        //  Forward pass. Shades all light in a single pass. GI + emission + Fog
+        Pass
+        {
+            // Lightmode matches the ShaderPassName set in UniversalRenderPipeline.cs. SRPDefaultUnlit and passes with
+            // no LightMode tag are also rendered by Universal Render Pipeline
+            Name "ForwardLit"
+            Tags
+            {
+                "LightMode" = "UniversalForward"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            Blend[_SrcBlend][_DstBlend], [_SrcBlendAlpha][_DstBlendAlpha]
+            ZWrite[_ZWrite]
+            Cull[_Cull]
+            AlphaToMask[_AlphaToMask]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+            
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex LitPassVertex
+            #pragma fragment LitPassFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _NORMALMAP
+            #pragma shader_feature_local _PARALLAXMAP
+            #pragma shader_feature_local _RECEIVE_SHADOWS_OFF
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+            #pragma shader_feature_local_fragment _SURFACE_TYPE_TRANSPARENT
+            #pragma shader_feature_local_fragment _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _ _ALPHAPREMULTIPLY_ON _ALPHAMODULATE_ON
+            #pragma shader_feature_local_fragment _EMISSION
+            #pragma shader_feature_local_fragment _METALLICSPECGLOSSMAP
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+            #pragma shader_feature_local_fragment _OCCLUSIONMAP
+            #pragma shader_feature_local_fragment _SPECULARHIGHLIGHTS_OFF
+            #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
+            #pragma shader_feature_local_fragment _SPECULAR_SETUP
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+            #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN
+            #pragma multi_compile_fragment _ _SCREEN_SPACE_SHADOW_LOW_RESOLUTION_PCF
+            #pragma multi_compile_fragment _  _SOFTSHADOW_MASK
+            #pragma multi_compile_fragment _ PLANAR_SHADOW
+            #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
+            #pragma multi_compile _ EVALUATE_SH_MIXED EVALUATE_SH_VERTEX
+            #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION
+            #pragma multi_compile_fragment _ _SHADOWS_SOFT _SHADOWS_SOFT_LOW _SHADOWS_SOFT_MEDIUM _SHADOWS_SOFT_HIGH
+            #pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION
+            #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3
+            #pragma multi_compile_fragment _ _LIGHT_COOKIES
+            #pragma multi_compile _ _LIGHT_LAYERS
+            #pragma multi_compile _ _FORWARD_PLUS
+            #include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
+
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING
+            #pragma multi_compile _ SHADOWS_SHADOWMASK
+            #pragma multi_compile _ DIRLIGHTMAP_COMBINED
+            #pragma multi_compile _ LIGHTMAP_ON
+            #pragma multi_compile _ DYNAMICLIGHTMAP_ON
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+            #pragma multi_compile_fog
+            #pragma multi_compile_fragment _ DEBUG_DISPLAY
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #pragma instancing_options renderinglayer
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+            
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/CapsuleShadow.hlsl"
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+            // #pragma enable_d3d11_debug_symbols
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitArrayInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitArrayForwardPass.hlsl"
+            ENDHLSL
+        }
+
+        Pass
+        {
+            Name "ShadowCaster"
+            Tags
+            {
+                "LightMode" = "ShadowCaster"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite On
+            ZTest LEqual
+            ColorMask 0
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex ShadowPassVertex
+            #pragma fragment ShadowPassFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+
+            // This is used during shadow map generation to differentiate between directional and punctual light shadows, as they use different formulas to apply Normal Bias
+            #pragma multi_compile_vertex _ _CASTING_PUNCTUAL_LIGHT_SHADOW
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/ShadowCasterPass.hlsl"
+            ENDHLSL
+        }
+
+        Pass
+        {
+            // Lightmode matches the ShaderPassName set in UniversalRenderPipeline.cs. SRPDefaultUnlit and passes with
+            // no LightMode tag are also rendered by Universal Render Pipeline
+            Name "GBuffer"
+            Tags
+            {
+                "LightMode" = "UniversalGBuffer"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite[_ZWrite]
+            ZTest LEqual
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 4.5
+
+            // Deferred Rendering Path does not support the OpenGL-based graphics API:
+            // Desktop OpenGL, OpenGL ES 3.0, WebGL 2.0.
+            #pragma exclude_renderers gles3 glcore
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex LitGBufferPassVertex
+            #pragma fragment LitGBufferPassFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _NORMALMAP
+            #pragma shader_feature_local_fragment _ALPHATEST_ON
+            //#pragma shader_feature_local_fragment _ALPHAPREMULTIPLY_ON
+            #pragma shader_feature_local_fragment _EMISSION
+            #pragma shader_feature_local_fragment _METALLICSPECGLOSSMAP
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+            #pragma shader_feature_local_fragment _OCCLUSIONMAP
+            #pragma shader_feature_local _PARALLAXMAP
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+
+            #pragma shader_feature_local_fragment _SPECULARHIGHLIGHTS_OFF
+            #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
+            #pragma shader_feature_local_fragment _SPECULAR_SETUP
+            #pragma shader_feature_local _RECEIVE_SHADOWS_OFF
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+            #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN
+            //#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
+            //#pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION
+            #pragma multi_compile_fragment _ _SHADOWS_SOFT _SHADOWS_SOFT_LOW _SHADOWS_SOFT_MEDIUM _SHADOWS_SOFT_HIGH
+            #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3
+            #pragma multi_compile_fragment _ _RENDER_PASS_ENABLED
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING
+            #pragma multi_compile _ SHADOWS_SHADOWMASK
+            #pragma multi_compile _ DIRLIGHTMAP_COMBINED
+            #pragma multi_compile _ LIGHTMAP_ON
+            #pragma multi_compile _ DYNAMICLIGHTMAP_ON
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+            #pragma multi_compile_fragment _ _GBUFFER_NORMALS_OCT
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #pragma instancing_options renderinglayer
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitGBufferPass.hlsl"
+            ENDHLSL
+        }
+
+        Pass
+        {
+            Name "DepthOnly"
+            Tags
+            {
+                "LightMode" = "DepthOnly"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite On
+            ColorMask R
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex DepthOnlyVertex
+            #pragma fragment DepthOnlyFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/DepthOnlyPass.hlsl"
+            ENDHLSL
+        }
+
+        // This pass is used when drawing to a _CameraNormalsTexture texture
+        Pass
+        {
+            Name "DepthNormals"
+            Tags
+            {
+                "LightMode" = "DepthNormals"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite On
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex DepthNormalsVertex
+            #pragma fragment DepthNormalsFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _NORMALMAP
+            #pragma shader_feature_local _PARALLAXMAP
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+            #pragma shader_feature_local _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitDepthNormalsPass.hlsl"
+            ENDHLSL
+        }
+
+        // This pass it not used during regular rendering, only for lightmap baking.
+        Pass
+        {
+            Name "Meta"
+            Tags
+            {
+                "LightMode" = "Meta"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            Cull Off
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex UniversalVertexMeta
+            #pragma fragment UniversalFragmentMetaLit
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local_fragment _SPECULAR_SETUP
+            #pragma shader_feature_local_fragment _EMISSION
+            #pragma shader_feature_local_fragment _METALLICSPECGLOSSMAP
+            #pragma shader_feature_local_fragment _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _ _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+            #pragma shader_feature_local_fragment _SPECGLOSSMAP
+            #pragma shader_feature EDITOR_VISUALIZATION
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitMetaPass.hlsl"
+            ENDHLSL
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArray.shader.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArray.shader.meta
new file mode 100644
index 0000000..563b4e3
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArray.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 152a680b0196dcb42b07eb8946d46a22
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayForwardPass.hlsl b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayForwardPass.hlsl
new file mode 100644
index 0000000..84c5514
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayForwardPass.hlsl
@@ -0,0 +1,250 @@
+#ifndef UNIVERSAL_FORWARD_LITARRAY_PASS_INCLUDED
+#define UNIVERSAL_FORWARD_LITARRAY_PASS_INCLUDED
+
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
+#if defined(LOD_FADE_CROSSFADE)
+    #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/LODCrossFade.hlsl"
+#endif
+
+// GLES2 has limited amount of interpolators
+#if defined(_PARALLAXMAP) && !defined(SHADER_API_GLES)
+#define REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR
+#endif
+
+#if (defined(_NORMALMAP) || (defined(_PARALLAXMAP) && !defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR))) || defined(_DETAIL)
+#define REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR
+#endif
+
+// keep this file in sync with LitGBufferPass.hlsl
+
+struct Attributes
+{
+    float4 positionOS   : POSITION;
+    float3 normalOS     : NORMAL;
+    float4 tangentOS    : TANGENT;
+    float2 texcoord     : TEXCOORD0;
+    float2 staticLightmapUV   : TEXCOORD1;
+    float2 dynamicLightmapUV  : TEXCOORD2;
+    float4 color         : COLOR;
+    UNITY_VERTEX_INPUT_INSTANCE_ID
+};
+
+struct Varyings
+{
+    float2 uv                       : TEXCOORD0;
+
+#if defined(REQUIRES_WORLD_SPACE_POS_INTERPOLATOR)
+    float3 positionWS               : TEXCOORD1;
+#endif
+
+    float3 normalWS                 : TEXCOORD2;
+#if defined(REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR)
+    half4 tangentWS                : TEXCOORD3;    // xyz: tangent, w: sign
+#endif
+
+#ifdef _ADDITIONAL_LIGHTS_VERTEX
+    half4 fogFactorAndVertexLight   : TEXCOORD5; // x: fogFactor, yzw: vertex light
+#else
+    half  fogFactor                 : TEXCOORD5;
+#endif
+
+#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    float4 shadowCoord              : TEXCOORD6;
+#endif
+
+#if defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    half3 viewDirTS                : TEXCOORD7;
+#endif
+
+    DECLARE_LIGHTMAP_OR_SH(staticLightmapUV, vertexSH, 8);
+#ifdef DYNAMICLIGHTMAP_ON
+    float2  dynamicLightmapUV : TEXCOORD9; // Dynamic lightmap UVs
+#endif
+    nointerpolation int4 arraryIndex : TEXCOORD10;
+    float4 positionCS               : SV_POSITION;
+    UNITY_VERTEX_INPUT_INSTANCE_ID
+    UNITY_VERTEX_OUTPUT_STEREO
+};
+
+void InitializeInputData(Varyings input, half3 normalTS, out InputData inputData)
+{
+    inputData = (InputData)0;
+
+#if defined(REQUIRES_WORLD_SPACE_POS_INTERPOLATOR)
+    inputData.positionWS = input.positionWS;
+#endif
+
+    half3 viewDirWS = GetWorldSpaceNormalizeViewDir(input.positionWS);
+#if defined(_NORMALMAP) || defined(_DETAIL)
+    float sgn = input.tangentWS.w;      // should be either +1 or -1
+    float3 bitangent = sgn * cross(input.normalWS.xyz, input.tangentWS.xyz);
+    half3x3 tangentToWorld = half3x3(input.tangentWS.xyz, bitangent.xyz, input.normalWS.xyz);
+
+    #if defined(_NORMALMAP)
+    inputData.tangentToWorld = tangentToWorld;
+    #endif
+    inputData.normalWS = TransformTangentToWorld(normalTS, tangentToWorld);
+#else
+    inputData.normalWS = input.normalWS;
+#endif
+
+    inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS);
+    inputData.viewDirectionWS = viewDirWS;
+
+#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    inputData.shadowCoord = input.shadowCoord;
+#elif defined(MAIN_LIGHT_CALCULATE_SHADOWS)
+    inputData.shadowCoord = TransformWorldToShadowCoord(inputData.positionWS);
+#else
+    inputData.shadowCoord = float4(0, 0, 0, 0);
+#endif
+#ifdef _ADDITIONAL_LIGHTS_VERTEX
+    inputData.fogCoord = InitializeInputDataFog(float4(input.positionWS, 1.0), input.fogFactorAndVertexLight.x);
+    inputData.vertexLighting = input.fogFactorAndVertexLight.yzw;
+#else
+    inputData.fogCoord = InitializeInputDataFog(float4(input.positionWS, 1.0), input.fogFactor);
+#endif
+
+#if defined(DYNAMICLIGHTMAP_ON)
+    inputData.bakedGI = SAMPLE_GI(input.staticLightmapUV, input.dynamicLightmapUV, input.vertexSH, inputData.normalWS);
+#else
+    inputData.bakedGI = SAMPLE_GI(input.staticLightmapUV, input.vertexSH, inputData.normalWS);
+#endif
+
+    inputData.normalizedScreenSpaceUV = GetNormalizedScreenSpaceUV(input.positionCS);
+    inputData.shadowMask = SAMPLE_SHADOWMASK(input.staticLightmapUV);
+
+    #if defined(DEBUG_DISPLAY)
+    #if defined(DYNAMICLIGHTMAP_ON)
+    inputData.dynamicLightmapUV = input.dynamicLightmapUV;
+    #endif
+    #if defined(LIGHTMAP_ON)
+    inputData.staticLightmapUV = input.staticLightmapUV;
+    #else
+    inputData.vertexSH = input.vertexSH;
+    #endif
+    #endif
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//                  Vertex and Fragment functions                            //
+///////////////////////////////////////////////////////////////////////////////
+
+// Used in Standard (Physically Based) shader
+Varyings LitPassVertex(Attributes input)
+{
+    Varyings output = (Varyings)0;
+
+    UNITY_SETUP_INSTANCE_ID(input);
+    UNITY_TRANSFER_INSTANCE_ID(input, output);
+    UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
+
+    VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz);
+
+    // normalWS and tangentWS already normalize.
+    // this is required to avoid skewing the direction during interpolation
+    // also required for per-vertex lighting and SH evaluation
+    VertexNormalInputs normalInput = GetVertexNormalInputs(input.normalOS, input.tangentOS);
+
+    half3 vertexLight = VertexLighting(vertexInput.positionWS, normalInput.normalWS);
+
+    half fogFactor = 0;
+    #if !defined(_FOG_FRAGMENT)
+        fogFactor = ComputeFogFactor(vertexInput.positionCS.z);
+    #endif
+
+    output.uv = TRANSFORM_TEX(input.texcoord, _BaseMap);
+
+    // already normalized from normal transform to WS.
+    output.normalWS = normalInput.normalWS;
+#if defined(REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR) || defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    real sign = input.tangentOS.w * GetOddNegativeScale();
+    half4 tangentWS = half4(normalInput.tangentWS.xyz, sign);
+#endif
+#if defined(REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR)
+    output.tangentWS = tangentWS;
+#endif
+
+#if defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    half3 viewDirWS = GetWorldSpaceNormalizeViewDir(vertexInput.positionWS);
+    half3 viewDirTS = GetViewDirectionTangentSpace(tangentWS, output.normalWS, viewDirWS);
+    output.viewDirTS = viewDirTS;
+#endif
+
+    OUTPUT_LIGHTMAP_UV(input.staticLightmapUV, unity_LightmapST, output.staticLightmapUV);
+#ifdef DYNAMICLIGHTMAP_ON
+    output.dynamicLightmapUV = input.dynamicLightmapUV.xy * unity_DynamicLightmapST.xy + unity_DynamicLightmapST.zw;
+#endif
+    OUTPUT_SH(output.normalWS.xyz, output.vertexSH);
+#ifdef _ADDITIONAL_LIGHTS_VERTEX
+    output.fogFactorAndVertexLight = half4(fogFactor, vertexLight);
+#else
+    output.fogFactor = fogFactor;
+#endif
+
+#if defined(REQUIRES_WORLD_SPACE_POS_INTERPOLATOR)
+    output.positionWS = vertexInput.positionWS;
+#endif
+
+#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    output.shadowCoord = GetShadowCoord(vertexInput);
+#endif
+
+    output.positionCS = vertexInput.positionCS;
+    output.arraryIndex = int4(input.color * 255);
+    return output;
+}
+
+// Used in Standard (Physically Based) shader
+void LitPassFragment(
+    Varyings input
+    , out half4 outColor : SV_Target0
+#ifdef _WRITE_RENDERING_LAYERS
+    , out float4 outRenderingLayers : SV_Target1
+#endif
+)
+{
+    UNITY_SETUP_INSTANCE_ID(input);
+    UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
+
+#if defined(_PARALLAXMAP)
+#if defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    half3 viewDirTS = input.viewDirTS;
+#else
+    half3 viewDirWS = GetWorldSpaceNormalizeViewDir(input.positionWS);
+    half3 viewDirTS = GetViewDirectionTangentSpace(input.tangentWS, input.normalWS, viewDirWS);
+#endif
+    ApplyPerPixelDisplacement(viewDirTS, input.uv);
+#endif
+
+    SurfaceData surfaceData;
+    InitializeStandardLitSurfaceData(input.uv, input.arraryIndex, surfaceData);
+    // outColor = half4(surfaceData.normalTS,1);
+    // return;
+
+#ifdef LOD_FADE_CROSSFADE
+    LODFadeCrossFade(input.positionCS);
+#endif
+
+    InputData inputData;
+    InitializeInputData(input, surfaceData.normalTS, inputData);
+    SETUP_DEBUG_TEXTURE_DATA(inputData, input.uv, _BaseMap);
+
+#ifdef _DBUFFER
+    ApplyDecalToSurfaceData(input.positionCS, surfaceData, inputData);
+#endif
+
+    half4 color = UniversalFragmentPBR(inputData, surfaceData);
+    
+    color.rgb = MixFog(color.rgb, inputData.fogCoord);
+    color.a = OutputAlpha(color.a, IsSurfaceTypeTransparent(_Surface));
+
+    outColor = color;
+
+#ifdef _WRITE_RENDERING_LAYERS
+    uint renderingLayers = GetMeshRenderingLayer();
+    outRenderingLayers = float4(EncodeMeshRenderingLayer(renderingLayers), 0, 0, 0);
+#endif
+}
+
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayForwardPass.hlsl.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayForwardPass.hlsl.meta
new file mode 100644
index 0000000..2bd8e91
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayForwardPass.hlsl.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 618ac444c1d799d4fb60054ff915fe47
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayInput.hlsl b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayInput.hlsl
new file mode 100644
index 0000000..112ca58
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayInput.hlsl
@@ -0,0 +1,291 @@
+#ifndef UNIVERSAL_LITARRAY_INPUT_INCLUDED
+#define UNIVERSAL_LITARRAY_INPUT_INCLUDED
+#define  LIT_ARRAY
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonMaterial.hlsl"
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl"
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/ParallaxMapping.hlsl"
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DBuffer.hlsl"
+
+#if defined(_DETAIL_MULX2) || defined(_DETAIL_SCALED)
+#define _DETAIL
+#endif
+
+#if defined(_DETAIL_MULX2) || defined(_DETAIL_SCALED)
+#define _DETAIL
+#endif
+
+// NOTE: Do not ifdef the properties here as SRP batcher can not handle different layouts.
+CBUFFER_START(UnityPerMaterial)
+float4 _BaseMap_ST;
+float4 _DetailAlbedoMap_ST;
+half4 _BaseColor;
+half4 _SpecColor;
+half4 _EmissionColor;
+half _Cutoff;
+half _Smoothness;
+half _Metallic;
+half _BumpScale;
+half _Parallax;
+half _OcclusionStrength;
+half _ClearCoatMask;
+half _ClearCoatSmoothness;
+half _DetailAlbedoMapScale;
+half _DetailNormalMapScale;
+half _Surface;
+CBUFFER_END
+
+// NOTE: Do not ifdef the properties for dots instancing, but ifdef the actual usage.
+// Otherwise you might break CPU-side as property constant-buffer offsets change per variant.
+// NOTE: Dots instancing is orthogonal to the constant buffer above.
+#ifdef UNITY_DOTS_INSTANCING_ENABLED
+
+UNITY_DOTS_INSTANCING_START(MaterialPropertyMetadata)
+    UNITY_DOTS_INSTANCED_PROP(float4, _BaseColor)
+    UNITY_DOTS_INSTANCED_PROP(float4, _SpecColor)
+    UNITY_DOTS_INSTANCED_PROP(float4, _EmissionColor)
+    UNITY_DOTS_INSTANCED_PROP(float , _Cutoff)
+    UNITY_DOTS_INSTANCED_PROP(float , _Smoothness)
+    UNITY_DOTS_INSTANCED_PROP(float , _Metallic)
+    UNITY_DOTS_INSTANCED_PROP(float , _BumpScale)
+    UNITY_DOTS_INSTANCED_PROP(float , _Parallax)
+    UNITY_DOTS_INSTANCED_PROP(float , _OcclusionStrength)
+    UNITY_DOTS_INSTANCED_PROP(float , _ClearCoatMask)
+    UNITY_DOTS_INSTANCED_PROP(float , _ClearCoatSmoothness)
+    UNITY_DOTS_INSTANCED_PROP(float , _DetailAlbedoMapScale)
+    UNITY_DOTS_INSTANCED_PROP(float , _DetailNormalMapScale)
+    UNITY_DOTS_INSTANCED_PROP(float , _Surface)
+UNITY_DOTS_INSTANCING_END(MaterialPropertyMetadata)
+
+// Here, we want to avoid overriding a property like e.g. _BaseColor with something like this:
+// #define _BaseColor UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _BaseColor0)
+//
+// It would be simpler, but it can cause the compiler to regenerate the property loading code for each use of _BaseColor.
+//
+// To avoid this, the property loads are cached in some static values at the beginning of the shader.
+// The properties such as _BaseColor are then overridden so that it expand directly to the static value like this:
+// #define _BaseColor unity_DOTS_Sampled_BaseColor
+//
+// This simple fix happened to improve GPU performances by ~10% on Meta Quest 2 with URP on some scenes.
+static float4 unity_DOTS_Sampled_BaseColor;
+static float4 unity_DOTS_Sampled_SpecColor;
+static float4 unity_DOTS_Sampled_EmissionColor;
+static float  unity_DOTS_Sampled_Cutoff;
+static float  unity_DOTS_Sampled_Smoothness;
+static float  unity_DOTS_Sampled_Metallic;
+static float  unity_DOTS_Sampled_BumpScale;
+static float  unity_DOTS_Sampled_Parallax;
+static float  unity_DOTS_Sampled_OcclusionStrength;
+static float  unity_DOTS_Sampled_ClearCoatMask;
+static float  unity_DOTS_Sampled_ClearCoatSmoothness;
+static float  unity_DOTS_Sampled_DetailAlbedoMapScale;
+static float  unity_DOTS_Sampled_DetailNormalMapScale;
+static float  unity_DOTS_Sampled_Surface;
+
+void SetupDOTSLitMaterialPropertyCaches()
+{
+    unity_DOTS_Sampled_BaseColor            = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _BaseColor);
+    unity_DOTS_Sampled_SpecColor            = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _SpecColor);
+    unity_DOTS_Sampled_EmissionColor        = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _EmissionColor);
+    unity_DOTS_Sampled_Cutoff               = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Cutoff);
+    unity_DOTS_Sampled_Smoothness           = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Smoothness);
+    unity_DOTS_Sampled_Metallic             = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Metallic);
+    unity_DOTS_Sampled_BumpScale            = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _BumpScale);
+    unity_DOTS_Sampled_Parallax             = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Parallax);
+    unity_DOTS_Sampled_OcclusionStrength    = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _OcclusionStrength);
+    unity_DOTS_Sampled_ClearCoatMask        = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _ClearCoatMask);
+    unity_DOTS_Sampled_ClearCoatSmoothness  = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _ClearCoatSmoothness);
+    unity_DOTS_Sampled_DetailAlbedoMapScale = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _DetailAlbedoMapScale);
+    unity_DOTS_Sampled_DetailNormalMapScale = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _DetailNormalMapScale);
+    unity_DOTS_Sampled_Surface              = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Surface);
+}
+
+#undef UNITY_SETUP_DOTS_MATERIAL_PROPERTY_CACHES
+#define UNITY_SETUP_DOTS_MATERIAL_PROPERTY_CACHES() SetupDOTSLitMaterialPropertyCaches()
+
+#define _BaseColor              unity_DOTS_Sampled_BaseColor
+#define _SpecColor              unity_DOTS_Sampled_SpecColor
+#define _EmissionColor          unity_DOTS_Sampled_EmissionColor
+#define _Cutoff                 unity_DOTS_Sampled_Cutoff
+#define _Smoothness             unity_DOTS_Sampled_Smoothness
+#define _Metallic               unity_DOTS_Sampled_Metallic
+#define _BumpScale              unity_DOTS_Sampled_BumpScale
+#define _Parallax               unity_DOTS_Sampled_Parallax
+#define _OcclusionStrength      unity_DOTS_Sampled_OcclusionStrength
+#define _ClearCoatMask          unity_DOTS_Sampled_ClearCoatMask
+#define _ClearCoatSmoothness    unity_DOTS_Sampled_ClearCoatSmoothness
+#define _DetailAlbedoMapScale   unity_DOTS_Sampled_DetailAlbedoMapScale
+#define _DetailNormalMapScale   unity_DOTS_Sampled_DetailNormalMapScale
+#define _Surface                unity_DOTS_Sampled_Surface
+
+#endif
+
+TEXTURE2D(_ParallaxMap);        SAMPLER(sampler_ParallaxMap);
+TEXTURE2D_ARRAY(_OcclusionMap);       SAMPLER(sampler_OcclusionMap);
+TEXTURE2D(_DetailMask);         SAMPLER(sampler_DetailMask);
+TEXTURE2D(_DetailAlbedoMap);    SAMPLER(sampler_DetailAlbedoMap);
+TEXTURE2D(_DetailNormalMap);    SAMPLER(sampler_DetailNormalMap);
+TEXTURE2D_ARRAY(_MetallicGlossMap);   SAMPLER(sampler_MetallicGlossMap);
+TEXTURE2D(_SpecGlossMap);       SAMPLER(sampler_SpecGlossMap);
+TEXTURE2D(_ClearCoatMap);       SAMPLER(sampler_ClearCoatMap);
+
+#ifdef _SPECULAR_SETUP
+    #define SAMPLE_METALLICSPECULAR(uv, slice) SAMPLE_TEXTURE2D_ARRAY(_SpecGlossMap, sampler_SpecGlossMap, uv, slice)
+#else
+    #define SAMPLE_METALLICSPECULAR(uv, slice) SAMPLE_TEXTURE2D_ARRAY(_MetallicGlossMap, sampler_MetallicGlossMap, uv, slice)
+#endif
+
+half4 SampleMetallicSpecGloss(float2 uv, half albedoAlpha, int slice)
+{
+    half4 specGloss;
+
+#ifdef _METALLICSPECGLOSSMAP
+    specGloss = half4(SAMPLE_METALLICSPECULAR(uv, slice));
+    #ifdef _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+        specGloss.a = albedoAlpha * _Smoothness;
+    #else
+        specGloss.a *= _Smoothness;
+    #endif
+#else // _METALLICSPECGLOSSMAP
+    #if _SPECULAR_SETUP
+        specGloss.rgb = _SpecColor.rgb;
+    #else
+        specGloss.rgb = _Metallic.rrr;
+    #endif
+
+    #ifdef _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+        specGloss.a = albedoAlpha * _Smoothness;
+    #else
+        specGloss.a = _Smoothness;
+    #endif
+#endif
+
+    return specGloss;
+}
+
+half SampleOcclusion(float2 uv, int slice)
+{
+    #ifdef _OCCLUSIONMAP
+        half occ = SAMPLE_TEXTURE2D_ARRAY(_OcclusionMap, sampler_OcclusionMap, uv, slice).g;
+        return LerpWhiteTo(occ, _OcclusionStrength);
+    #else
+        return half(1.0);
+    #endif
+}
+
+
+// Returns clear coat parameters
+// .x/.r == mask
+// .y/.g == smoothness
+half2 SampleClearCoat(float2 uv)
+{
+#if defined(_CLEARCOAT) || defined(_CLEARCOATMAP)
+    half2 clearCoatMaskSmoothness = half2(_ClearCoatMask, _ClearCoatSmoothness);
+
+#if defined(_CLEARCOATMAP)
+    clearCoatMaskSmoothness *= SAMPLE_TEXTURE2D(_ClearCoatMap, sampler_ClearCoatMap, uv).rg;
+#endif
+
+    return clearCoatMaskSmoothness;
+#else
+    return half2(0.0, 1.0);
+#endif  // _CLEARCOAT
+}
+
+void ApplyPerPixelDisplacement(half3 viewDirTS, inout float2 uv)
+{
+#if defined(_PARALLAXMAP)
+    uv += ParallaxMapping(TEXTURE2D_ARGS(_ParallaxMap, sampler_ParallaxMap), viewDirTS, _Parallax, uv);
+#endif
+}
+
+// Used for scaling detail albedo. Main features:
+// - Depending if detailAlbedo brightens or darkens, scale magnifies effect.
+// - No effect is applied if detailAlbedo is 0.5.
+half3 ScaleDetailAlbedo(half3 detailAlbedo, half scale)
+{
+    // detailAlbedo = detailAlbedo * 2.0h - 1.0h;
+    // detailAlbedo *= _DetailAlbedoMapScale;
+    // detailAlbedo = detailAlbedo * 0.5h + 0.5h;
+    // return detailAlbedo * 2.0f;
+
+    // A bit more optimized
+    return half(2.0) * detailAlbedo * scale - scale + half(1.0);
+}
+
+half3 ApplyDetailAlbedo(float2 detailUv, half3 albedo, half detailMask)
+{
+#if defined(_DETAIL)
+    half3 detailAlbedo = SAMPLE_TEXTURE2D(_DetailAlbedoMap, sampler_DetailAlbedoMap, detailUv).rgb;
+
+    // In order to have same performance as builtin, we do scaling only if scale is not 1.0 (Scaled version has 6 additional instructions)
+#if defined(_DETAIL_SCALED)
+    detailAlbedo = ScaleDetailAlbedo(detailAlbedo, _DetailAlbedoMapScale);
+#else
+    detailAlbedo = half(2.0) * detailAlbedo;
+#endif
+
+    return albedo * LerpWhiteTo(detailAlbedo, detailMask);
+#else
+    return albedo;
+#endif
+}
+
+half3 ApplyDetailNormal(float2 detailUv, half3 normalTS, half detailMask)
+{
+#if defined(_DETAIL)
+#if BUMP_SCALE_NOT_SUPPORTED
+    half3 detailNormalTS = UnpackNormal(SAMPLE_TEXTURE2D(_DetailNormalMap, sampler_DetailNormalMap, detailUv));
+#else
+    half3 detailNormalTS = UnpackNormalScale(SAMPLE_TEXTURE2D(_DetailNormalMap, sampler_DetailNormalMap, detailUv), _DetailNormalMapScale);
+#endif
+
+    // With UNITY_NO_DXT5nm unpacked vector is not normalized for BlendNormalRNM
+    // For visual consistancy we going to do in all cases
+    detailNormalTS = normalize(detailNormalTS);
+
+    return lerp(normalTS, BlendNormalRNM(normalTS, detailNormalTS), detailMask); // todo: detailMask should lerp the angle of the quaternion rotation, not the normals
+#else
+    return normalTS;
+#endif
+}
+
+inline void InitializeStandardLitSurfaceData(float2 uv, int4 slice, out SurfaceData outSurfaceData)
+{
+    half4 albedoAlpha = SampleAlbedoAlpha(uv, slice.x, TEXTURE2D_ARRAY_ARGS(_BaseMap, sampler_BaseMap));
+    outSurfaceData.alpha = Alpha(albedoAlpha.a, _BaseColor, _Cutoff);
+
+    half4 specGloss = SampleMetallicSpecGloss(uv, albedoAlpha.a, slice.w);
+    outSurfaceData.albedo = albedoAlpha.rgb * _BaseColor.rgb;
+    outSurfaceData.albedo = AlphaModulate(outSurfaceData.albedo, outSurfaceData.alpha);
+#if _SPECULAR_SETUP
+    outSurfaceData.metallic = half(1.0);
+    outSurfaceData.specular = specGloss.rgb;
+#else
+    outSurfaceData.metallic = specGloss.r;
+    outSurfaceData.specular = half3(0.0, 0.0, 0.0);
+#endif
+
+    outSurfaceData.smoothness = specGloss.a;
+    outSurfaceData.normalTS = SampleNormal(uv, slice.y, TEXTURE2D_ARRAY_ARGS(_BumpMap, sampler_BumpMap), _BumpScale);
+    outSurfaceData.occlusion = SampleOcclusion(uv, slice.w);
+    outSurfaceData.emission = SampleEmission(uv,slice.z, _EmissionColor.rgb, TEXTURE2D_ARRAY_ARGS(_EmissionMap, sampler_EmissionMap));
+
+#if defined(_CLEARCOAT) || defined(_CLEARCOATMAP)
+    half2 clearCoat = SampleClearCoat(uv);
+    outSurfaceData.clearCoatMask       = clearCoat.r;
+    outSurfaceData.clearCoatSmoothness = clearCoat.g;
+#else
+    outSurfaceData.clearCoatMask       = half(0.0);
+    outSurfaceData.clearCoatSmoothness = half(0.0);
+#endif
+
+#if defined(_DETAIL)
+    half detailMask = SAMPLE_TEXTURE2D(_DetailMask, sampler_DetailMask, uv).a;
+    float2 detailUv = uv * _DetailAlbedoMap_ST.xy + _DetailAlbedoMap_ST.zw;
+    outSurfaceData.albedo = ApplyDetailAlbedo(detailUv, outSurfaceData.albedo, detailMask);
+    outSurfaceData.normalTS = ApplyDetailNormal(detailUv, outSurfaceData.normalTS, detailMask);
+#endif
+}
+
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayInput.hlsl.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayInput.hlsl.meta
new file mode 100644
index 0000000..34fa06a
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitArrayInput.hlsl.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 88779e12dc634e5da143d009cd25417e
+timeCreated: 1762246178
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlas.shader b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlas.shader
new file mode 100644
index 0000000..0324d8d
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlas.shader
@@ -0,0 +1,454 @@
+Shader "Universal Render Pipeline/LitAtlas"
+{
+    Properties
+    {
+        // Specular vs Metallic workflow
+        _WorkflowMode("WorkflowMode", Float) = 1.0
+
+        [MainTexture] _BaseMap("Albedo", 2D) = "white" {}
+        [MainColor] _BaseColor("Color", Color) = (1,1,1,1)
+        
+        _atlasScale("Atlas Scale", Float) = 1
+        _atlasOffset("Atlas Offset", 2d) = "black" {}
+
+        _Cutoff("Alpha Cutoff", Range(0.0, 1.0)) = 0.5
+
+        _Smoothness("Smoothness", Range(0.0, 1.0)) = 0.5
+        _SmoothnessTextureChannel("Smoothness texture channel", Float) = 0
+
+        _Metallic("Metallic", Range(0.0, 1.0)) = 0.0
+        _MetallicGlossMap("Metallic", 2D) = "white" {}
+
+        _SpecColor("Specular", Color) = (0.2, 0.2, 0.2)
+        _SpecGlossMap("Specular", 2D) = "white" {}
+
+        [ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 1.0
+        [ToggleOff] _EnvironmentReflections("Environment Reflections", Float) = 1.0
+
+        _BumpScale("Scale", Float) = 1.0
+        _BumpMap("Normal Map", 2D) = "bump" {}
+
+        _Parallax("Scale", Range(0.005, 0.08)) = 0.005
+        _ParallaxMap("Height Map", 2D) = "black" {}
+
+        _OcclusionStrength("Strength", Range(0.0, 1.0)) = 1.0
+        _OcclusionMap("Occlusion", 2D) = "white" {}
+
+        [HDR] _EmissionColor("Color", Color) = (0,0,0)
+        _EmissionMap("Emission", 2D) = "white" {}
+
+        _DetailMask("Detail Mask", 2D) = "white" {}
+        _DetailAlbedoMapScale("Scale", Range(0.0, 2.0)) = 1.0
+        _DetailAlbedoMap("Detail Albedo x2", 2D) = "linearGrey" {}
+        _DetailNormalMapScale("Scale", Range(0.0, 2.0)) = 1.0
+        [Normal] _DetailNormalMap("Normal Map", 2D) = "bump" {}
+
+        // SRP batching compatibility for Clear Coat (Not used in Lit)
+        [HideInInspector] _ClearCoatMask("_ClearCoatMask", Float) = 0.0
+        [HideInInspector] _ClearCoatSmoothness("_ClearCoatSmoothness", Float) = 0.0
+
+        // Blending state
+        _Surface("__surface", Float) = 0.0
+        _Blend("__blend", Float) = 0.0
+        _Cull("__cull", Float) = 2.0
+        [ToggleUI] _AlphaClip("__clip", Float) = 0.0
+        [HideInInspector] _SrcBlend("__src", Float) = 1.0
+        [HideInInspector] _DstBlend("__dst", Float) = 0.0
+        [HideInInspector] _SrcBlendAlpha("__srcA", Float) = 1.0
+        [HideInInspector] _DstBlendAlpha("__dstA", Float) = 0.0
+        [HideInInspector] _ZWrite("__zw", Float) = 1.0
+        [HideInInspector] _BlendModePreserveSpecular("_BlendModePreserveSpecular", Float) = 1.0
+        [HideInInspector] _AlphaToMask("__alphaToMask", Float) = 0.0
+
+        [ToggleUI] _ReceiveShadows("Receive Shadows", Float) = 1.0
+        // Editmode props
+        _QueueOffset("Queue offset", Float) = 0.0
+
+        // ObsoleteProperties
+        [HideInInspector] _MainTex("BaseMap", 2D) = "white" {}
+        [HideInInspector] _Color("Base Color", Color) = (1, 1, 1, 1)
+        [HideInInspector] _GlossMapScale("Smoothness", Float) = 0.0
+        [HideInInspector] _Glossiness("Smoothness", Float) = 0.0
+        [HideInInspector] _GlossyReflections("EnvironmentReflections", Float) = 0.0
+
+        [HideInInspector][NoScaleOffset]unity_Lightmaps("unity_Lightmaps", 2DArray) = "" {}
+        [HideInInspector][NoScaleOffset]unity_LightmapsInd("unity_LightmapsInd", 2DArray) = "" {}
+        [HideInInspector][NoScaleOffset]unity_ShadowMasks("unity_ShadowMasks", 2DArray) = "" {}
+    }
+
+    SubShader
+    {
+        // Universal Pipeline tag is required. If Universal render pipeline is not set in the graphics settings
+        // this Subshader will fail. One can add a subshader below or fallback to Standard built-in to make this
+        // material work with both Universal Render Pipeline and Builtin Unity Pipeline
+        Tags
+        {
+            "RenderType" = "Opaque"
+            "RenderPipeline" = "UniversalPipeline"
+            "UniversalMaterialType" = "Lit"
+            "IgnoreProjector" = "True"
+        }
+        LOD 300
+
+        // ------------------------------------------------------------------
+        //  Forward pass. Shades all light in a single pass. GI + emission + Fog
+        Pass
+        {
+            // Lightmode matches the ShaderPassName set in UniversalRenderPipeline.cs. SRPDefaultUnlit and passes with
+            // no LightMode tag are also rendered by Universal Render Pipeline
+            Name "ForwardLit"
+            Tags
+            {
+                "LightMode" = "UniversalForward"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            Blend[_SrcBlend][_DstBlend], [_SrcBlendAlpha][_DstBlendAlpha]
+            ZWrite[_ZWrite]
+            Cull[_Cull]
+            AlphaToMask[_AlphaToMask]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex LitPassVertex
+            #pragma fragment LitPassFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _NORMALMAP
+            #pragma shader_feature_local _PARALLAXMAP
+            #pragma shader_feature_local _RECEIVE_SHADOWS_OFF
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+            #pragma shader_feature_local_fragment _SURFACE_TYPE_TRANSPARENT
+            #pragma shader_feature_local_fragment _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _ _ALPHAPREMULTIPLY_ON _ALPHAMODULATE_ON
+            #pragma shader_feature_local_fragment _EMISSION
+            #pragma shader_feature_local_fragment _METALLICSPECGLOSSMAP
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+            #pragma shader_feature_local_fragment _OCCLUSIONMAP
+            #pragma shader_feature_local_fragment _SPECULARHIGHLIGHTS_OFF
+            #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
+            #pragma shader_feature_local_fragment _SPECULAR_SETUP
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+            #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN
+            #pragma multi_compile_fragment _ _SCREEN_SPACE_SHADOW_LOW_RESOLUTION_PCF
+            #pragma multi_compile_fragment _  _SOFTSHADOW_MASK
+            #pragma multi_compile_fragment _ PLANAR_SHADOW
+            #pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
+            #pragma multi_compile _ EVALUATE_SH_MIXED EVALUATE_SH_VERTEX
+            #pragma multi_compile_fragment _ _ADDITIONAL_LIGHT_SHADOWS
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION
+            #pragma multi_compile_fragment _ _SHADOWS_SOFT _SHADOWS_SOFT_LOW _SHADOWS_SOFT_MEDIUM _SHADOWS_SOFT_HIGH
+            #pragma multi_compile_fragment _ _SCREEN_SPACE_OCCLUSION
+            #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3
+            #pragma multi_compile_fragment _ _LIGHT_COOKIES
+            #pragma multi_compile _ _LIGHT_LAYERS
+            #pragma multi_compile _ _FORWARD_PLUS
+            #include_with_pragmas "Packages/com.unity.render-pipelines.core/ShaderLibrary/FoveatedRenderingKeywords.hlsl"
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
+
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING
+            #pragma multi_compile _ SHADOWS_SHADOWMASK
+            #pragma multi_compile _ DIRLIGHTMAP_COMBINED
+            #pragma multi_compile _ LIGHTMAP_ON
+            #pragma multi_compile _ DYNAMICLIGHTMAP_ON
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+            #pragma multi_compile_fog
+            #pragma multi_compile_fragment _ DEBUG_DISPLAY
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #pragma instancing_options renderinglayer
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+            
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/CapsuleShadow.hlsl"
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+            // #pragma enable_d3d11_debug_symbols
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitAtlasInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitAtlasForwardPass.hlsl"
+            ENDHLSL
+        }
+
+        Pass
+        {
+            Name "ShadowCaster"
+            Tags
+            {
+                "LightMode" = "ShadowCaster"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite On
+            ZTest LEqual
+            ColorMask 0
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex ShadowPassVertex
+            #pragma fragment ShadowPassFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+
+            // This is used during shadow map generation to differentiate between directional and punctual light shadows, as they use different formulas to apply Normal Bias
+            #pragma multi_compile_vertex _ _CASTING_PUNCTUAL_LIGHT_SHADOW
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/ShadowCasterPass.hlsl"
+            ENDHLSL
+        }
+
+        Pass
+        {
+            // Lightmode matches the ShaderPassName set in UniversalRenderPipeline.cs. SRPDefaultUnlit and passes with
+            // no LightMode tag are also rendered by Universal Render Pipeline
+            Name "GBuffer"
+            Tags
+            {
+                "LightMode" = "UniversalGBuffer"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite[_ZWrite]
+            ZTest LEqual
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 4.5
+
+            // Deferred Rendering Path does not support the OpenGL-based graphics API:
+            // Desktop OpenGL, OpenGL ES 3.0, WebGL 2.0.
+            #pragma exclude_renderers gles3 glcore
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex LitGBufferPassVertex
+            #pragma fragment LitGBufferPassFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _NORMALMAP
+            #pragma shader_feature_local_fragment _ALPHATEST_ON
+            //#pragma shader_feature_local_fragment _ALPHAPREMULTIPLY_ON
+            #pragma shader_feature_local_fragment _EMISSION
+            #pragma shader_feature_local_fragment _METALLICSPECGLOSSMAP
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+            #pragma shader_feature_local_fragment _OCCLUSIONMAP
+            #pragma shader_feature_local _PARALLAXMAP
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+
+            #pragma shader_feature_local_fragment _SPECULARHIGHLIGHTS_OFF
+            #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
+            #pragma shader_feature_local_fragment _SPECULAR_SETUP
+            #pragma shader_feature_local _RECEIVE_SHADOWS_OFF
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+            #pragma multi_compile _ _MAIN_LIGHT_SHADOWS _MAIN_LIGHT_SHADOWS_CASCADE _MAIN_LIGHT_SHADOWS_SCREEN
+            //#pragma multi_compile _ _ADDITIONAL_LIGHTS_VERTEX _ADDITIONAL_LIGHTS
+            //#pragma multi_compile _ _ADDITIONAL_LIGHT_SHADOWS
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BLENDING
+            #pragma multi_compile_fragment _ _REFLECTION_PROBE_BOX_PROJECTION
+            #pragma multi_compile_fragment _ _SHADOWS_SOFT _SHADOWS_SOFT_LOW _SHADOWS_SOFT_MEDIUM _SHADOWS_SOFT_HIGH
+            #pragma multi_compile_fragment _ _DBUFFER_MRT1 _DBUFFER_MRT2 _DBUFFER_MRT3
+            #pragma multi_compile_fragment _ _RENDER_PASS_ENABLED
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile _ LIGHTMAP_SHADOW_MIXING
+            #pragma multi_compile _ SHADOWS_SHADOWMASK
+            #pragma multi_compile _ DIRLIGHTMAP_COMBINED
+            #pragma multi_compile _ LIGHTMAP_ON
+            #pragma multi_compile _ DYNAMICLIGHTMAP_ON
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+            #pragma multi_compile_fragment _ _GBUFFER_NORMALS_OCT
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #pragma instancing_options renderinglayer
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitGBufferPass.hlsl"
+            ENDHLSL
+        }
+
+        Pass
+        {
+            Name "DepthOnly"
+            Tags
+            {
+                "LightMode" = "DepthOnly"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite On
+            ColorMask R
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex DepthOnlyVertex
+            #pragma fragment DepthOnlyFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/DepthOnlyPass.hlsl"
+            ENDHLSL
+        }
+
+        // This pass is used when drawing to a _CameraNormalsTexture texture
+        Pass
+        {
+            Name "DepthNormals"
+            Tags
+            {
+                "LightMode" = "DepthNormals"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            ZWrite On
+            Cull[_Cull]
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex DepthNormalsVertex
+            #pragma fragment DepthNormalsFragment
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local _NORMALMAP
+            #pragma shader_feature_local _PARALLAXMAP
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+            #pragma shader_feature_local _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+
+            // -------------------------------------
+            // Unity defined keywords
+            #pragma multi_compile_fragment _ LOD_FADE_CROSSFADE
+
+            // -------------------------------------
+            // Universal Pipeline keywords
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/RenderingLayers.hlsl"
+
+            //--------------------------------------
+            // GPU Instancing
+            #pragma multi_compile_instancing
+            #include_with_pragmas "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DOTS.hlsl"
+
+            #pragma multi_compile_vertex _ ENABLE_VS_SKINNING
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitDepthNormalsPass.hlsl"
+            ENDHLSL
+        }
+
+        // This pass it not used during regular rendering, only for lightmap baking.
+        Pass
+        {
+            Name "Meta"
+            Tags
+            {
+                "LightMode" = "Meta"
+            }
+
+            // -------------------------------------
+            // Render State Commands
+            Cull Off
+
+            HLSLPROGRAM
+            #pragma target 2.0
+
+            // -------------------------------------
+            // Shader Stages
+            #pragma vertex UniversalVertexMeta
+            #pragma fragment UniversalFragmentMetaLit
+
+            // -------------------------------------
+            // Material Keywords
+            #pragma shader_feature_local_fragment _SPECULAR_SETUP
+            #pragma shader_feature_local_fragment _EMISSION
+            #pragma shader_feature_local_fragment _METALLICSPECGLOSSMAP
+            #pragma shader_feature_local_fragment _ALPHATEST_ON
+            #pragma shader_feature_local_fragment _ _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+            #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
+            #pragma shader_feature_local_fragment _SPECGLOSSMAP
+            #pragma shader_feature EDITOR_VISUALIZATION
+
+            // -------------------------------------
+            // Includes
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitMetaPass.hlsl"
+            ENDHLSL
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlas.shader.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlas.shader.meta
new file mode 100644
index 0000000..0961b58
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlas.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d8b23892e300d52429dc66b098a9c9fc
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasForwardPass.hlsl b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasForwardPass.hlsl
new file mode 100644
index 0000000..7ee47df
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasForwardPass.hlsl
@@ -0,0 +1,248 @@
+#ifndef UNIVERSAL_FORWARD_LITATLAS_PASS_INCLUDED
+#define UNIVERSAL_FORWARD_LITATLAS_PASS_INCLUDED
+
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
+#if defined(LOD_FADE_CROSSFADE)
+    #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/LODCrossFade.hlsl"
+#endif
+
+// GLES2 has limited amount of interpolators
+#if defined(_PARALLAXMAP) && !defined(SHADER_API_GLES)
+#define REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR
+#endif
+
+#if (defined(_NORMALMAP) || (defined(_PARALLAXMAP) && !defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR))) || defined(_DETAIL)
+#define REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR
+#endif
+
+// keep this file in sync with LitGBufferPass.hlsl
+
+struct Attributes
+{
+    float4 positionOS   : POSITION;
+    float3 normalOS     : NORMAL;
+    float4 tangentOS    : TANGENT;
+    float2 texcoord     : TEXCOORD0;
+    float2 staticLightmapUV   : TEXCOORD1;
+    float2 dynamicLightmapUV  : TEXCOORD2;
+    float4 color         : COLOR;
+    UNITY_VERTEX_INPUT_INSTANCE_ID
+};
+
+struct Varyings
+{
+    float2 uv                       : TEXCOORD0;
+
+#if defined(REQUIRES_WORLD_SPACE_POS_INTERPOLATOR)
+    float3 positionWS               : TEXCOORD1;
+#endif
+
+    float3 normalWS                 : TEXCOORD2;
+#if defined(REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR)
+    half4 tangentWS                : TEXCOORD3;    // xyz: tangent, w: sign
+#endif
+
+#ifdef _ADDITIONAL_LIGHTS_VERTEX
+    half4 fogFactorAndVertexLight   : TEXCOORD5; // x: fogFactor, yzw: vertex light
+#else
+    half  fogFactor                 : TEXCOORD5;
+#endif
+
+#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    float4 shadowCoord              : TEXCOORD6;
+#endif
+
+#if defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    half3 viewDirTS                : TEXCOORD7;
+#endif
+
+    DECLARE_LIGHTMAP_OR_SH(staticLightmapUV, vertexSH, 8);
+#ifdef DYNAMICLIGHTMAP_ON
+    float2  dynamicLightmapUV : TEXCOORD9; // Dynamic lightmap UVs
+#endif
+    float4 positionCS               : SV_POSITION;
+    UNITY_VERTEX_INPUT_INSTANCE_ID
+    UNITY_VERTEX_OUTPUT_STEREO
+};
+
+void InitializeInputData(Varyings input, half3 normalTS, out InputData inputData)
+{
+    inputData = (InputData)0;
+
+#if defined(REQUIRES_WORLD_SPACE_POS_INTERPOLATOR)
+    inputData.positionWS = input.positionWS;
+#endif
+
+    half3 viewDirWS = GetWorldSpaceNormalizeViewDir(input.positionWS);
+#if defined(_NORMALMAP) || defined(_DETAIL)
+    float sgn = input.tangentWS.w;      // should be either +1 or -1
+    float3 bitangent = sgn * cross(input.normalWS.xyz, input.tangentWS.xyz);
+    half3x3 tangentToWorld = half3x3(input.tangentWS.xyz, bitangent.xyz, input.normalWS.xyz);
+
+    #if defined(_NORMALMAP)
+    inputData.tangentToWorld = tangentToWorld;
+    #endif
+    inputData.normalWS = TransformTangentToWorld(normalTS, tangentToWorld);
+#else
+    inputData.normalWS = input.normalWS;
+#endif
+
+    inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS);
+    inputData.viewDirectionWS = viewDirWS;
+
+#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    inputData.shadowCoord = input.shadowCoord;
+#elif defined(MAIN_LIGHT_CALCULATE_SHADOWS)
+    inputData.shadowCoord = TransformWorldToShadowCoord(inputData.positionWS);
+#else
+    inputData.shadowCoord = float4(0, 0, 0, 0);
+#endif
+#ifdef _ADDITIONAL_LIGHTS_VERTEX
+    inputData.fogCoord = InitializeInputDataFog(float4(input.positionWS, 1.0), input.fogFactorAndVertexLight.x);
+    inputData.vertexLighting = input.fogFactorAndVertexLight.yzw;
+#else
+    inputData.fogCoord = InitializeInputDataFog(float4(input.positionWS, 1.0), input.fogFactor);
+#endif
+
+#if defined(DYNAMICLIGHTMAP_ON)
+    inputData.bakedGI = SAMPLE_GI(input.staticLightmapUV, input.dynamicLightmapUV, input.vertexSH, inputData.normalWS);
+#else
+    inputData.bakedGI = SAMPLE_GI(input.staticLightmapUV, input.vertexSH, inputData.normalWS);
+#endif
+
+    inputData.normalizedScreenSpaceUV = GetNormalizedScreenSpaceUV(input.positionCS);
+    inputData.shadowMask = SAMPLE_SHADOWMASK(input.staticLightmapUV);
+
+    #if defined(DEBUG_DISPLAY)
+    #if defined(DYNAMICLIGHTMAP_ON)
+    inputData.dynamicLightmapUV = input.dynamicLightmapUV;
+    #endif
+    #if defined(LIGHTMAP_ON)
+    inputData.staticLightmapUV = input.staticLightmapUV;
+    #else
+    inputData.vertexSH = input.vertexSH;
+    #endif
+    #endif
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//                  Vertex and Fragment functions                            //
+///////////////////////////////////////////////////////////////////////////////
+
+// Used in Standard (Physically Based) shader
+Varyings LitPassVertex(Attributes input)
+{
+    Varyings output = (Varyings)0;
+
+    UNITY_SETUP_INSTANCE_ID(input);
+    UNITY_TRANSFER_INSTANCE_ID(input, output);
+    UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output);
+
+    VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz);
+
+    // normalWS and tangentWS already normalize.
+    // this is required to avoid skewing the direction during interpolation
+    // also required for per-vertex lighting and SH evaluation
+    VertexNormalInputs normalInput = GetVertexNormalInputs(input.normalOS, input.tangentOS);
+
+    half3 vertexLight = VertexLighting(vertexInput.positionWS, normalInput.normalWS);
+
+    half fogFactor = 0;
+    #if !defined(_FOG_FRAGMENT)
+        fogFactor = ComputeFogFactor(vertexInput.positionCS.z);
+    #endif
+
+    output.uv = TRANSFORM_TEX(input.texcoord, _BaseMap);
+    int index = int(input.color.x * 255);
+    float2 offset = _atlasOffset.Load(int3(index,0, 0)).xy;// _atlasOffset[int2(index,0)].xy;
+    output.uv = output.uv * _atlasScale + offset;
+    // already normalized from normal transform to WS.
+    output.normalWS = normalInput.normalWS;
+#if defined(REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR) || defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    real sign = input.tangentOS.w * GetOddNegativeScale();
+    half4 tangentWS = half4(normalInput.tangentWS.xyz, sign);
+#endif
+#if defined(REQUIRES_WORLD_SPACE_TANGENT_INTERPOLATOR)
+    output.tangentWS = tangentWS;
+#endif
+
+#if defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    half3 viewDirWS = GetWorldSpaceNormalizeViewDir(vertexInput.positionWS);
+    half3 viewDirTS = GetViewDirectionTangentSpace(tangentWS, output.normalWS, viewDirWS);
+    output.viewDirTS = viewDirTS;
+#endif
+
+    OUTPUT_LIGHTMAP_UV(input.staticLightmapUV, unity_LightmapST, output.staticLightmapUV);
+#ifdef DYNAMICLIGHTMAP_ON
+    output.dynamicLightmapUV = input.dynamicLightmapUV.xy * unity_DynamicLightmapST.xy + unity_DynamicLightmapST.zw;
+#endif
+    OUTPUT_SH(output.normalWS.xyz, output.vertexSH);
+#ifdef _ADDITIONAL_LIGHTS_VERTEX
+    output.fogFactorAndVertexLight = half4(fogFactor, vertexLight);
+#else
+    output.fogFactor = fogFactor;
+#endif
+
+#if defined(REQUIRES_WORLD_SPACE_POS_INTERPOLATOR)
+    output.positionWS = vertexInput.positionWS;
+#endif
+
+#if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR)
+    output.shadowCoord = GetShadowCoord(vertexInput);
+#endif
+
+    output.positionCS = vertexInput.positionCS;
+    return output;
+}
+
+// Used in Standard (Physically Based) shader
+void LitPassFragment(
+    Varyings input
+    , out half4 outColor : SV_Target0
+#ifdef _WRITE_RENDERING_LAYERS
+    , out float4 outRenderingLayers : SV_Target1
+#endif
+)
+{
+    UNITY_SETUP_INSTANCE_ID(input);
+    UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input);
+
+#if defined(_PARALLAXMAP)
+#if defined(REQUIRES_TANGENT_SPACE_VIEW_DIR_INTERPOLATOR)
+    half3 viewDirTS = input.viewDirTS;
+#else
+    half3 viewDirWS = GetWorldSpaceNormalizeViewDir(input.positionWS);
+    half3 viewDirTS = GetViewDirectionTangentSpace(input.tangentWS, input.normalWS, viewDirWS);
+#endif
+    ApplyPerPixelDisplacement(viewDirTS, input.uv);
+#endif
+
+    SurfaceData surfaceData;
+    InitializeStandardLitSurfaceData(input.uv, surfaceData);
+
+#ifdef LOD_FADE_CROSSFADE
+    LODFadeCrossFade(input.positionCS);
+#endif
+
+    InputData inputData;
+    InitializeInputData(input, surfaceData.normalTS, inputData);
+    SETUP_DEBUG_TEXTURE_DATA(inputData, input.uv, _BaseMap);
+
+#ifdef _DBUFFER
+    ApplyDecalToSurfaceData(input.positionCS, surfaceData, inputData);
+#endif
+
+    half4 color = UniversalFragmentPBR(inputData, surfaceData);
+    
+    color.rgb = MixFog(color.rgb, inputData.fogCoord);
+    color.a = OutputAlpha(color.a, IsSurfaceTypeTransparent(_Surface));
+
+    outColor = color;
+
+#ifdef _WRITE_RENDERING_LAYERS
+    uint renderingLayers = GetMeshRenderingLayer();
+    outRenderingLayers = float4(EncodeMeshRenderingLayer(renderingLayers), 0, 0, 0);
+#endif
+}
+
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasForwardPass.hlsl.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasForwardPass.hlsl.meta
new file mode 100644
index 0000000..9e8f771
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasForwardPass.hlsl.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79eb26185afb9d4479bf24e7e6bba868
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasInput.hlsl b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasInput.hlsl
new file mode 100644
index 0000000..bea5daf
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasInput.hlsl
@@ -0,0 +1,293 @@
+#ifndef UNIVERSAL_LITATLAS_INPUT_INCLUDED
+#define UNIVERSAL_LITATLAS_INPUT_INCLUDED
+
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/CommonMaterial.hlsl"
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl"
+#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/ParallaxMapping.hlsl"
+#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DBuffer.hlsl"
+
+#if defined(_DETAIL_MULX2) || defined(_DETAIL_SCALED)
+#define _DETAIL
+#endif
+
+#if defined(_DETAIL_MULX2) || defined(_DETAIL_SCALED)
+#define _DETAIL
+#endif
+
+// NOTE: Do not ifdef the properties here as SRP batcher can not handle different layouts.
+CBUFFER_START(UnityPerMaterial)
+float4 _BaseMap_ST;
+float4 _DetailAlbedoMap_ST;
+half4 _BaseColor;
+half4 _SpecColor;
+half4 _EmissionColor;
+half _Cutoff;
+half _Smoothness;
+half _Metallic;
+half _BumpScale;
+half _Parallax;
+half _OcclusionStrength;
+half _ClearCoatMask;
+half _ClearCoatSmoothness;
+half _DetailAlbedoMapScale;
+half _DetailNormalMapScale;
+half _Surface;
+half _atlasScale;
+CBUFFER_END
+
+// NOTE: Do not ifdef the properties for dots instancing, but ifdef the actual usage.
+// Otherwise you might break CPU-side as property constant-buffer offsets change per variant.
+// NOTE: Dots instancing is orthogonal to the constant buffer above.
+#ifdef UNITY_DOTS_INSTANCING_ENABLED
+
+UNITY_DOTS_INSTANCING_START(MaterialPropertyMetadata)
+    UNITY_DOTS_INSTANCED_PROP(float4, _BaseColor)
+    UNITY_DOTS_INSTANCED_PROP(float4, _SpecColor)
+    UNITY_DOTS_INSTANCED_PROP(float4, _EmissionColor)
+    UNITY_DOTS_INSTANCED_PROP(float , _Cutoff)
+    UNITY_DOTS_INSTANCED_PROP(float , _Smoothness)
+    UNITY_DOTS_INSTANCED_PROP(float , _Metallic)
+    UNITY_DOTS_INSTANCED_PROP(float , _BumpScale)
+    UNITY_DOTS_INSTANCED_PROP(float , _Parallax)
+    UNITY_DOTS_INSTANCED_PROP(float , _OcclusionStrength)
+    UNITY_DOTS_INSTANCED_PROP(float , _ClearCoatMask)
+    UNITY_DOTS_INSTANCED_PROP(float , _ClearCoatSmoothness)
+    UNITY_DOTS_INSTANCED_PROP(float , _DetailAlbedoMapScale)
+    UNITY_DOTS_INSTANCED_PROP(float , _DetailNormalMapScale)
+    UNITY_DOTS_INSTANCED_PROP(float , _Surface)
+UNITY_DOTS_INSTANCING_END(MaterialPropertyMetadata)
+
+// Here, we want to avoid overriding a property like e.g. _BaseColor with something like this:
+// #define _BaseColor UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _BaseColor0)
+//
+// It would be simpler, but it can cause the compiler to regenerate the property loading code for each use of _BaseColor.
+//
+// To avoid this, the property loads are cached in some static values at the beginning of the shader.
+// The properties such as _BaseColor are then overridden so that it expand directly to the static value like this:
+// #define _BaseColor unity_DOTS_Sampled_BaseColor
+//
+// This simple fix happened to improve GPU performances by ~10% on Meta Quest 2 with URP on some scenes.
+static float4 unity_DOTS_Sampled_BaseColor;
+static float4 unity_DOTS_Sampled_SpecColor;
+static float4 unity_DOTS_Sampled_EmissionColor;
+static float  unity_DOTS_Sampled_Cutoff;
+static float  unity_DOTS_Sampled_Smoothness;
+static float  unity_DOTS_Sampled_Metallic;
+static float  unity_DOTS_Sampled_BumpScale;
+static float  unity_DOTS_Sampled_Parallax;
+static float  unity_DOTS_Sampled_OcclusionStrength;
+static float  unity_DOTS_Sampled_ClearCoatMask;
+static float  unity_DOTS_Sampled_ClearCoatSmoothness;
+static float  unity_DOTS_Sampled_DetailAlbedoMapScale;
+static float  unity_DOTS_Sampled_DetailNormalMapScale;
+static float  unity_DOTS_Sampled_Surface;
+
+void SetupDOTSLitMaterialPropertyCaches()
+{
+    unity_DOTS_Sampled_BaseColor            = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _BaseColor);
+    unity_DOTS_Sampled_SpecColor            = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _SpecColor);
+    unity_DOTS_Sampled_EmissionColor        = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float4, _EmissionColor);
+    unity_DOTS_Sampled_Cutoff               = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Cutoff);
+    unity_DOTS_Sampled_Smoothness           = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Smoothness);
+    unity_DOTS_Sampled_Metallic             = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Metallic);
+    unity_DOTS_Sampled_BumpScale            = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _BumpScale);
+    unity_DOTS_Sampled_Parallax             = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Parallax);
+    unity_DOTS_Sampled_OcclusionStrength    = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _OcclusionStrength);
+    unity_DOTS_Sampled_ClearCoatMask        = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _ClearCoatMask);
+    unity_DOTS_Sampled_ClearCoatSmoothness  = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _ClearCoatSmoothness);
+    unity_DOTS_Sampled_DetailAlbedoMapScale = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _DetailAlbedoMapScale);
+    unity_DOTS_Sampled_DetailNormalMapScale = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _DetailNormalMapScale);
+    unity_DOTS_Sampled_Surface              = UNITY_ACCESS_DOTS_INSTANCED_PROP_WITH_DEFAULT(float , _Surface);
+}
+
+#undef UNITY_SETUP_DOTS_MATERIAL_PROPERTY_CACHES
+#define UNITY_SETUP_DOTS_MATERIAL_PROPERTY_CACHES() SetupDOTSLitMaterialPropertyCaches()
+
+#define _BaseColor              unity_DOTS_Sampled_BaseColor
+#define _SpecColor              unity_DOTS_Sampled_SpecColor
+#define _EmissionColor          unity_DOTS_Sampled_EmissionColor
+#define _Cutoff                 unity_DOTS_Sampled_Cutoff
+#define _Smoothness             unity_DOTS_Sampled_Smoothness
+#define _Metallic               unity_DOTS_Sampled_Metallic
+#define _BumpScale              unity_DOTS_Sampled_BumpScale
+#define _Parallax               unity_DOTS_Sampled_Parallax
+#define _OcclusionStrength      unity_DOTS_Sampled_OcclusionStrength
+#define _ClearCoatMask          unity_DOTS_Sampled_ClearCoatMask
+#define _ClearCoatSmoothness    unity_DOTS_Sampled_ClearCoatSmoothness
+#define _DetailAlbedoMapScale   unity_DOTS_Sampled_DetailAlbedoMapScale
+#define _DetailNormalMapScale   unity_DOTS_Sampled_DetailNormalMapScale
+#define _Surface                unity_DOTS_Sampled_Surface
+
+#endif
+
+TEXTURE2D(_ParallaxMap);        SAMPLER(sampler_ParallaxMap);
+TEXTURE2D(_OcclusionMap);       SAMPLER(sampler_OcclusionMap);
+TEXTURE2D(_DetailMask);         SAMPLER(sampler_DetailMask);
+TEXTURE2D(_DetailAlbedoMap);    SAMPLER(sampler_DetailAlbedoMap);
+TEXTURE2D(_DetailNormalMap);    SAMPLER(sampler_DetailNormalMap);
+TEXTURE2D(_MetallicGlossMap);   SAMPLER(sampler_MetallicGlossMap);
+TEXTURE2D(_SpecGlossMap);       SAMPLER(sampler_SpecGlossMap);
+TEXTURE2D(_ClearCoatMap);       SAMPLER(sampler_ClearCoatMap);
+Texture2D _atlasOffset;
+#ifdef _SPECULAR_SETUP
+    #define SAMPLE_METALLICSPECULAR(uv) SAMPLE_TEXTURE2D(_SpecGlossMap, sampler_SpecGlossMap, uv)
+#else
+    #define SAMPLE_METALLICSPECULAR(uv) SAMPLE_TEXTURE2D(_MetallicGlossMap, sampler_MetallicGlossMap, uv)
+#endif
+
+half4 SampleMetallicSpecGloss(float2 uv, half albedoAlpha)
+{
+    half4 specGloss;
+
+#ifdef _METALLICSPECGLOSSMAP
+    specGloss = half4(SAMPLE_METALLICSPECULAR(uv));
+    #ifdef _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+        specGloss.a = albedoAlpha * _Smoothness;
+    #else
+        specGloss.a *= _Smoothness;
+    #endif
+#else // _METALLICSPECGLOSSMAP
+    #if _SPECULAR_SETUP
+        specGloss.rgb = _SpecColor.rgb;
+    #else
+        specGloss.rgb = _Metallic.rrr;
+    #endif
+
+    #ifdef _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+        specGloss.a = albedoAlpha * _Smoothness;
+    #else
+        specGloss.a = _Smoothness;
+    #endif
+#endif
+
+    return specGloss;
+}
+
+half SampleOcclusion(float2 uv)
+{
+    #ifdef _OCCLUSIONMAP
+        half occ = SAMPLE_TEXTURE2D(_OcclusionMap, sampler_OcclusionMap, uv).g;
+        return LerpWhiteTo(occ, _OcclusionStrength);
+    #else
+        return half(1.0);
+    #endif
+}
+
+
+// Returns clear coat parameters
+// .x/.r == mask
+// .y/.g == smoothness
+half2 SampleClearCoat(float2 uv)
+{
+#if defined(_CLEARCOAT) || defined(_CLEARCOATMAP)
+    half2 clearCoatMaskSmoothness = half2(_ClearCoatMask, _ClearCoatSmoothness);
+
+#if defined(_CLEARCOATMAP)
+    clearCoatMaskSmoothness *= SAMPLE_TEXTURE2D(_ClearCoatMap, sampler_ClearCoatMap, uv).rg;
+#endif
+
+    return clearCoatMaskSmoothness;
+#else
+    return half2(0.0, 1.0);
+#endif  // _CLEARCOAT
+}
+
+void ApplyPerPixelDisplacement(half3 viewDirTS, inout float2 uv)
+{
+#if defined(_PARALLAXMAP)
+    uv += ParallaxMapping(TEXTURE2D_ARGS(_ParallaxMap, sampler_ParallaxMap), viewDirTS, _Parallax, uv);
+#endif
+}
+
+// Used for scaling detail albedo. Main features:
+// - Depending if detailAlbedo brightens or darkens, scale magnifies effect.
+// - No effect is applied if detailAlbedo is 0.5.
+half3 ScaleDetailAlbedo(half3 detailAlbedo, half scale)
+{
+    // detailAlbedo = detailAlbedo * 2.0h - 1.0h;
+    // detailAlbedo *= _DetailAlbedoMapScale;
+    // detailAlbedo = detailAlbedo * 0.5h + 0.5h;
+    // return detailAlbedo * 2.0f;
+
+    // A bit more optimized
+    return half(2.0) * detailAlbedo * scale - scale + half(1.0);
+}
+
+half3 ApplyDetailAlbedo(float2 detailUv, half3 albedo, half detailMask)
+{
+#if defined(_DETAIL)
+    half3 detailAlbedo = SAMPLE_TEXTURE2D(_DetailAlbedoMap, sampler_DetailAlbedoMap, detailUv).rgb;
+
+    // In order to have same performance as builtin, we do scaling only if scale is not 1.0 (Scaled version has 6 additional instructions)
+#if defined(_DETAIL_SCALED)
+    detailAlbedo = ScaleDetailAlbedo(detailAlbedo, _DetailAlbedoMapScale);
+#else
+    detailAlbedo = half(2.0) * detailAlbedo;
+#endif
+
+    return albedo * LerpWhiteTo(detailAlbedo, detailMask);
+#else
+    return albedo;
+#endif
+}
+
+half3 ApplyDetailNormal(float2 detailUv, half3 normalTS, half detailMask)
+{
+#if defined(_DETAIL)
+#if BUMP_SCALE_NOT_SUPPORTED
+    half3 detailNormalTS = UnpackNormal(SAMPLE_TEXTURE2D(_DetailNormalMap, sampler_DetailNormalMap, detailUv));
+#else
+    half3 detailNormalTS = UnpackNormalScale(SAMPLE_TEXTURE2D(_DetailNormalMap, sampler_DetailNormalMap, detailUv), _DetailNormalMapScale);
+#endif
+
+    // With UNITY_NO_DXT5nm unpacked vector is not normalized for BlendNormalRNM
+    // For visual consistancy we going to do in all cases
+    detailNormalTS = normalize(detailNormalTS);
+
+    return lerp(normalTS, BlendNormalRNM(normalTS, detailNormalTS), detailMask); // todo: detailMask should lerp the angle of the quaternion rotation, not the normals
+#else
+    return normalTS;
+#endif
+}
+
+inline void InitializeStandardLitSurfaceData(float2 uv, out SurfaceData outSurfaceData)
+{
+    half4 albedoAlpha = SampleAlbedoAlpha(uv, TEXTURE2D_ARGS(_BaseMap, sampler_BaseMap));
+    outSurfaceData.alpha = Alpha(albedoAlpha.a, _BaseColor, _Cutoff);
+
+    half4 specGloss = SampleMetallicSpecGloss(uv, albedoAlpha.a);
+    outSurfaceData.albedo = albedoAlpha.rgb * _BaseColor.rgb;
+    outSurfaceData.albedo = AlphaModulate(outSurfaceData.albedo, outSurfaceData.alpha);
+
+#if _SPECULAR_SETUP
+    outSurfaceData.metallic = half(1.0);
+    outSurfaceData.specular = specGloss.rgb;
+#else
+    outSurfaceData.metallic = specGloss.r;
+    outSurfaceData.specular = half3(0.0, 0.0, 0.0);
+#endif
+
+    outSurfaceData.smoothness = specGloss.a;
+    outSurfaceData.normalTS = SampleNormal(uv, TEXTURE2D_ARGS(_BumpMap, sampler_BumpMap), _BumpScale);
+    outSurfaceData.occlusion = SampleOcclusion(uv);
+    outSurfaceData.emission = SampleEmission(uv, _EmissionColor.rgb, TEXTURE2D_ARGS(_EmissionMap, sampler_EmissionMap));
+
+#if defined(_CLEARCOAT) || defined(_CLEARCOATMAP)
+    half2 clearCoat = SampleClearCoat(uv);
+    outSurfaceData.clearCoatMask       = clearCoat.r;
+    outSurfaceData.clearCoatSmoothness = clearCoat.g;
+#else
+    outSurfaceData.clearCoatMask       = half(0.0);
+    outSurfaceData.clearCoatSmoothness = half(0.0);
+#endif
+
+#if defined(_DETAIL)
+    half detailMask = SAMPLE_TEXTURE2D(_DetailMask, sampler_DetailMask, uv).a;
+    float2 detailUv = uv * _DetailAlbedoMap_ST.xy + _DetailAlbedoMap_ST.zw;
+    outSurfaceData.albedo = ApplyDetailAlbedo(detailUv, outSurfaceData.albedo, detailMask);
+    outSurfaceData.normalTS = ApplyDetailNormal(detailUv, outSurfaceData.normalTS, detailMask);
+#endif
+}
+
+#endif
diff --git a/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasInput.hlsl.meta b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasInput.hlsl.meta
new file mode 100644
index 0000000..7d02cb2
--- /dev/null
+++ b/Packages/com.unity.render-pipelines.universal@14.0.11/Shaders/LitAtlasInput.hlsl.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f1b9f1324a449b2438aceafb168f219e
+ShaderIncludeImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 2cfd968..87b21f1 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.shaunfong.bonevisualizer": "https://github.com/Shaun-Fong/UnityBoneVisualizer.git",
     "com.unity.burst": "1.8.19",
     "com.unity.cinemachine": "2.10.3",
     "com.unity.collab-proxy": "2.7.1",
@@ -10,6 +9,7 @@
     "com.unity.inputsystem": "1.14.0",
     "com.unity.learn.iet-framework": "3.1.3",
     "com.unity.memoryprofiler": "1.1.6",
+    "com.unity.performance.profile-analyzer": "1.2.4",
     "com.unity.recorder": "4.0.3",
     "com.unity.render-pipelines.universal": "14.0.12",
     "com.unity.splines": "2.8.0",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index a98f995..07a1aea 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,12 +1,5 @@
 {
   "dependencies": {
-    "com.shaunfong.bonevisualizer": {
-      "version": "https://github.com/Shaun-Fong/UnityBoneVisualizer.git",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {},
-      "hash": "0fd18b0f977325bc7b45155848eba3935d717568"
-    },
     "com.unity.burst": {
       "version": "1.8.19",
       "depth": 0,
@@ -121,6 +114,12 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.performance.profile-analyzer": {
+      "version": "file:com.unity.performance.profile-analyzer@1.2.4",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
     "com.unity.profiling.core": {
       "version": "1.0.2",
       "depth": 1,