diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md
index 6dd9248c2..14a87162c 100755
--- a/package/CHANGELOG.md
+++ b/package/CHANGELOG.md
@@ -4,50 +4,24 @@ 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).
 
-## [5.8.2-preview] - 2019-03-14
-### Fixed
-- Issue that remove the edge when dragging an edge from slot to the same slot.
-- Exception when undoing an edge deletion on a dynamic operator. 
-- Exception regarding undo/redo when dragging a edge linked to a dynamic operator on another slot.
-- Missing graph invalidation in VFXGraph.OnEnable, was causing trouble with value invalidation until next recompilation
+## [6.5.2-preview] - 2019-03-11
 
-## [5.8.1-preview] - 2019-03-13
+## [6.5.1-preview] - 2019-03-08
 
-## [5.8.0-preview] - 2019-03-13
-### Added
-- Addressing mode for Sequential blocks
-- Invert transform available on GPU
-- Add automatic depth buffer reference for main camera (for position and collision blocks)
-- Total Time for PreWarm in Visual Effect Asset inspector
-- Support for unlit output with LWRP
+## [6.5.0-preview] - 2019-03-07
 
-### Fixed
-- Better Handling of Null or Missing Parameter Binders (Editor + Runtime)
-- Undo Redo while changing space
-- Type declaration was unmodifiable due to exception during space intialization 
-- Fix unexpected issue when plugging per particle data into hash of per component fixed random
-- Missing asset reimport when exception has been thrown during graph compilation
-- Fix exception when using a Oriented Box Volume node [Case 1110419](https://issuetracker.unity3d.com/issues/operator-indexoutofrangeexception-when-using-a-volume-oriented-box-node)
-- Add missing blend value slot in Inherit Source Attribute blocks [Case 1120568](https://issuetracker.unity3d.com/issues/source-attribute-blend-source-attribute-blocks-are-not-useful-without-the-blend-value)
-- Visual Effect Inspector Cosmetic Improvements
-- Exception while removing a sub-slot of a dynamic operator
+## [6.4.0-preview] - 2019-02-21
 
-## [5.7.0-preview] - 2019-03-07
+## [6.3.0-preview] - 2019-02-18
 
-## [5.6.0-preview] - 2019-02-21
+## [6.2.0-preview] - 2019-02-15
 
-## [5.5.0-preview] - 2019-02-18
 ### Changed
-- Code refactor: all macros with ARGS have been swapped with macros with PARAM. This is because the ARGS macros were incorrectly named
+- Code refactor: all macros with ARGS have been swapped with macros with PARAM. This is because the ARGS macros were incorrectly named.
 
-## [5.4.0-preview] - 2019-02-11
-### Fixed
-- Incorrect toggle rectangle in VisualEffect inspector
-- Shader compilation with SimpleLit and debug display
-
-## [5.3.1-preview] - 2019-01-28
+## [6.1.0-preview] - 2019-02-13
 
-## [5.3.0-preview] - 2019-01-28
+## [6.0.0-preview] - 2019-02-23
 ### Added
 - Add spawnTime & spawnCount operator
 - Add seed slot to constant random mode of Attribute from curve and map
@@ -68,6 +42,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fix fog on decals
 - Saturate alpha component in outputs
 - Fixed scaleY in ConnectTarget
+- Incorrect toggle rectangle in VisualEffect inspector
+- Shader compilation with SimpleLit and debug display
 
 ## [5.2.0-preview] - 2018-11-27
 ### Added
diff --git a/package/Documentation~/index.md b/package/Documentation~/index.md
index ce57f9966..327f362d5 100755
--- a/package/Documentation~/index.md
+++ b/package/Documentation~/index.md
@@ -35,7 +35,7 @@ Make sure your project is already configured with HD Render Pipeline before proc
 
 ## Getting Started
 
-To get started right away with Visual Effect Graph, you can visit [this page](Visual-Effect-Graph-Getting-Started) that sums up most of the features you need to know about.
+To get started right away with Visual Effect Graph, you can visit [this page](Getting-Started) that sums up most of the features you need to know about.
 
 ## Documentation
 
diff --git a/package/Editor/Compiler/VFXGraphCompiledData.cs b/package/Editor/Compiler/VFXGraphCompiledData.cs
index ec37ae441..dd2e154ab 100755
--- a/package/Editor/Compiler/VFXGraphCompiledData.cs
+++ b/package/Editor/Compiler/VFXGraphCompiledData.cs
@@ -608,11 +608,11 @@ public void Compile(VFXCompilationMode compilationMode, bool forceShaderValidati
             }
 
             Profiler.BeginSample("VFXEditor.CompileAsset");
-            float nbSteps = 12.0f;
-            string assetPath = AssetDatabase.GetAssetPath(visualEffectResource);
-            string progressBarTitle = "Compiling " + assetPath;
             try
             {
+                float nbSteps = 12.0f;
+                string assetPath = AssetDatabase.GetAssetPath(visualEffectResource);
+                string progressBarTitle = "Compiling " + assetPath;
 
                 EditorUtility.DisplayProgressBar(progressBarTitle, "Collecting dependencies", 0 / nbSteps);
                 var models = new HashSet<ScriptableObject>();
@@ -737,6 +737,11 @@ public void Compile(VFXCompilationMode compilationMode, bool forceShaderValidati
                 {
                     k_FnVFXResource_SetCompileInitialVariants(m_Graph.visualEffectResource, forceShaderValidation);
                 }
+
+                EditorUtility.DisplayProgressBar(progressBarTitle, "Importing VFX", 11 / nbSteps);
+                Profiler.BeginSample("VFXEditor.CompileAsset:ImportAsset");
+                AssetDatabase.ImportAsset(assetPath, ImportAssetOptions.ForceUpdate); //This should compile the shaders on the C++ size
+                Profiler.EndSample();
             }
             catch (Exception e)
             {
@@ -751,11 +756,6 @@ public void Compile(VFXCompilationMode compilationMode, bool forceShaderValidati
             }
             finally
             {
-                EditorUtility.DisplayProgressBar(progressBarTitle, "Importing VFX", 11 / nbSteps);
-                Profiler.BeginSample("VFXEditor.CompileAsset:ImportAsset");
-                AssetDatabase.ImportAsset(assetPath, ImportAssetOptions.ForceUpdate); //This should compile the shaders on the C++ size
-                Profiler.EndSample();
-
                 Profiler.EndSample();
                 EditorUtility.ClearProgressBar();
             }
diff --git a/package/Editor/Core/VFXLibrary.cs b/package/Editor/Core/VFXLibrary.cs
index 0cbde53a7..5f4410685 100755
--- a/package/Editor/Core/VFXLibrary.cs
+++ b/package/Editor/Core/VFXLibrary.cs
@@ -162,8 +162,6 @@ static class VFXLibrary
         public static IEnumerable<VFXModelDescriptor<VFXOperator>> GetOperators()   { LoadIfNeeded(); return VFXViewPreference.displayExperimentalOperator ? m_OperatorDescs : m_OperatorDescs.Where(o => !o.info.experimental); }
         public static IEnumerable<VFXModelDescriptor<VFXSlot>> GetSlots()           { LoadSlotsIfNeeded(); return m_SlotDescs.Values; }
         public static IEnumerable<Type> GetSlotsType()                              { LoadSlotsIfNeeded(); return m_SlotDescs.Keys; }
-        public static bool IsSpaceableSlotType(Type type)                           { LoadSlotsIfNeeded(); return m_SlotSpaceable.Contains(type); }
-
         public static IEnumerable<VFXModelDescriptorParameters> GetParameters()     { LoadIfNeeded(); return m_ParametersDescs; }
 
         public static VFXModelDescriptor<VFXSlot> GetSlot(System.Type type)
@@ -237,26 +235,6 @@ public static void Load()
             }
         }
 
-        private static bool IsSpaceable(Type type)
-        {
-            var spaceAttributeOnType = type.GetCustomAttributes(typeof(VFXSpaceAttribute), true).FirstOrDefault();
-            if (spaceAttributeOnType != null)
-            {
-                return true;
-            }
-
-            var fields = type.GetFields(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance).ToArray();
-            foreach (var field in fields)
-            {
-                var spaceAttributeOnField = field.GetCustomAttributes(typeof(VFXSpaceAttribute), true).FirstOrDefault();
-                if (spaceAttributeOnField != null || IsSpaceable(field.FieldType))
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         private static void LoadSlotsIfNeeded()
         {
             if (m_SlotLoaded)
@@ -267,14 +245,6 @@ private static void LoadSlotsIfNeeded()
                 if (!m_SlotLoaded)
                 {
                     m_SlotDescs = LoadSlots();
-                    m_SlotSpaceable = new HashSet<Type>();
-                    foreach (var slotDescType in m_SlotDescs.Keys)
-                    {
-                        if (IsSpaceable(slotDescType))
-                        {
-                            m_SlotSpaceable.Add(slotDescType);
-                        }
-                    }
                     m_SlotLoaded = true;
                 }
             }
@@ -391,7 +361,6 @@ public static IEnumerable<Type> FindConcreteSubclasses(Type objectType = null, T
         private static volatile List<VFXModelDescriptor<VFXBlock>> m_BlockDescs;
         private static volatile List<VFXModelDescriptorParameters> m_ParametersDescs;
         private static volatile Dictionary<Type, VFXModelDescriptor<VFXSlot>> m_SlotDescs;
-        private static volatile HashSet<Type> m_SlotSpaceable;
 
         private static Object m_Lock = new Object();
         private static volatile bool m_Loaded = false;
diff --git a/package/Editor/Expressions/VFXExpressionCamera.cs b/package/Editor/Expressions/VFXExpressionCamera.cs
index 3431e4a0f..9dc2866b8 100755
--- a/package/Editor/Expressions/VFXExpressionCamera.cs
+++ b/package/Editor/Expressions/VFXExpressionCamera.cs
@@ -143,19 +143,4 @@ sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
                 return VFXValue.Constant(CameraType.defaultValue.pixelDimensions);
         }
     }
-
-    class VFXExpressionGetBufferFromMainCamera : VFXExpression
-    {
-        public VFXExpressionGetBufferFromMainCamera(VFXCameraBufferTypes bufferType) : base(VFXExpression.Flags.InvalidOnGPU)
-        {
-            m_BufferType = bufferType;
-        }
-
-        public override VFXExpressionOperation operation { get { return VFXExpressionOperation.GetBufferFromMainCamera; }}
-        sealed protected override VFXExpression Evaluate(VFXExpression[] constParents) { return VFXValue.Constant<Texture2D>(null); }
-
-        protected override int[] additionnalOperands { get { return new int[] { (int)m_BufferType }; } }
-        private VFXCameraBufferTypes m_BufferType;
-    }
-
 }
diff --git a/package/Editor/Expressions/VFXExpressionMath.cs b/package/Editor/Expressions/VFXExpressionMath.cs
index 7c4ebeb2a..17462a9b3 100755
--- a/package/Editor/Expressions/VFXExpressionMath.cs
+++ b/package/Editor/Expressions/VFXExpressionMath.cs
@@ -215,98 +215,12 @@ protected override bool ProcessUnaryOperation(bool input)
         }
     }
 
-    class VFXExpressionSaturate : VFXExpressionUnaryFloatOperation
-    {
-        public VFXExpressionSaturate() : this(VFXValue<float>.Default) { }
-
-        public VFXExpressionSaturate(VFXExpression parent) : base(parent, VFXExpressionOperation.Saturate)
-        {
-            if (!IsFloatValueType(parent.valueType))
-                throw new InvalidOperationException("Unexpected VFXExpressionSaturate type with parent " + parent.valueType);
-        }
-
-        sealed protected override string GetUnaryOperationCode(string x)
-        {
-            return string.Format("saturate({0})", x);
-        }
-
-        sealed protected override float ProcessUnaryOperation(float input)
-        {
-            return Mathf.Clamp01(input);
-        }
-    }
-
-    class VFXExpressionCeil : VFXExpressionUnaryFloatOperation
-    {
-        public VFXExpressionCeil() : this(VFXValue<float>.Default) { }
-
-        public VFXExpressionCeil(VFXExpression parent) : base(parent, VFXExpressionOperation.Ceil)
-        {
-            if (!IsFloatValueType(parent.valueType))
-                throw new InvalidOperationException("Unexpected VFXExpressionCeil type with parent " + parent.valueType);
-        }
-
-        sealed protected override string GetUnaryOperationCode(string x)
-        {
-            return string.Format("ceil({0})", x);
-        }
-
-        sealed protected override float ProcessUnaryOperation(float input)
-        {
-            return Mathf.Ceil(input);
-        }
-    }
-
-    class VFXExpressionRound : VFXExpressionUnaryFloatOperation
-    {
-        public VFXExpressionRound() : this(VFXValue<float>.Default) { }
-
-        public VFXExpressionRound(VFXExpression parent) : base(parent, VFXExpressionOperation.Round)
-        {
-            if (!IsFloatValueType(parent.valueType))
-                throw new InvalidOperationException("Unexpected VFXExpressionRound type with parent " + parent.valueType);
-        }
-
-        sealed protected override string GetUnaryOperationCode(string x)
-        {
-            return string.Format("round({0})", x);
-        }
-
-        sealed protected override float ProcessUnaryOperation(float input)
-        {
-            return Mathf.Round(input);
-        }
-    }
-
-    class VFXExpressionFrac : VFXExpressionUnaryFloatOperation
-    {
-        public VFXExpressionFrac() : this(VFXValue<float>.Default) { }
-
-        public VFXExpressionFrac(VFXExpression parent) : base(parent, VFXExpressionOperation.Frac)
-        {
-            if (!IsFloatValueType(parent.valueType))
-                throw new InvalidOperationException("Unexpected VFXExpressionFrac type with parent " + parent.valueType);
-        }
-
-        sealed protected override string GetUnaryOperationCode(string x)
-        {
-            return string.Format("frac({0})", x);
-        }
-
-        sealed protected override float ProcessUnaryOperation(float input)
-        {
-            return Mathf.Repeat(input, 1.0f);
-        }
-    }
-
     class VFXExpressionFloor : VFXExpressionUnaryFloatOperation
     {
         public VFXExpressionFloor() : this(VFXValue<float>.Default) {}
 
         public VFXExpressionFloor(VFXExpression parent) : base(parent, VFXExpressionOperation.Floor)
         {
-            if (!IsFloatValueType(parent.valueType))
-                throw new InvalidOperationException("Unexpected VFXExpressionFloor type with parent " + parent.valueType);
         }
 
         sealed protected override string GetUnaryOperationCode(string x)
@@ -554,16 +468,6 @@ sealed protected override string GetBinaryOperationCode(string left, string righ
                 return string.Format("{0} < {1} ? {0} : {1}", left, right);
             return string.Format("min({0}, {1})", left, right);
         }
-
-        protected override VFXExpression Reduce(VFXExpression[] reducedParents)
-        {
-            VFXExpression inputSaturateExpression = null;
-            if (VFXExpressionMax.CanBeReducedToSaturate(this, reducedParents, out inputSaturateExpression))
-            {
-                return new VFXExpressionSaturate(inputSaturateExpression);
-            }
-            return base.Reduce(reducedParents);
-        }
     }
 
     class VFXExpressionMax : VFXExpressionBinaryNumericOperation
@@ -602,62 +506,6 @@ protected override string GetBinaryOperationCode(string left, string right, VFXV
                 return string.Format("{0} > {1} ? {0} : {1}", left, right);
             return string.Format("max({0}, {1})", left, right);
         }
-
-        static public bool CanBeReducedToSaturate(VFXExpression current, VFXExpression[] reducedParents, out VFXExpression inputValueRef)
-        {
-            inputValueRef = null;
-            var valueType = current.valueType;
-            if (reducedParents.Length != 2 || !VFXExpression.IsFloatValueType(valueType))
-                return false;
-
-            var one = VFXOperatorUtility.OneExpression[valueType];
-            var zero = VFXOperatorUtility.ZeroExpression[valueType];
-
-            Type searchInnerFunctionType = null;
-            VFXExpression searchInnerValueFirstLevel = null;
-            VFXExpression searchInnerValueSecondLevel = null;
-
-            if (current is VFXExpressionMax)
-            {
-                searchInnerFunctionType = typeof(VFXExpressionMin);
-                searchInnerValueFirstLevel = zero;
-                searchInnerValueSecondLevel = one;
-            }
-            else if (current is VFXExpressionMin)
-            {
-                searchInnerFunctionType = typeof(VFXExpressionMax);
-                searchInnerValueFirstLevel = one;
-                searchInnerValueSecondLevel = zero;
-            }
-            else
-            {
-                return false;
-            }
-
-            var minReferenceExpected = reducedParents.FirstOrDefault(o => o.GetType() == searchInnerFunctionType);
-            var firstValueExpected = reducedParents.FirstOrDefault(o => o == searchInnerValueFirstLevel);
-            if (minReferenceExpected != null && firstValueExpected != null)
-            {
-                var indexOf = Array.IndexOf(minReferenceExpected.parents, searchInnerValueSecondLevel);
-                if (indexOf != -1)
-                {
-                    var otherIndexOf = (indexOf + 1) % 2;
-                    inputValueRef = minReferenceExpected.parents[otherIndexOf];
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        protected override VFXExpression Reduce(VFXExpression[] reducedParents)
-        {
-            VFXExpression inputSaturateExpression = null;
-            if (CanBeReducedToSaturate(this, reducedParents, out inputSaturateExpression))
-            {
-                return new VFXExpressionSaturate(inputSaturateExpression);
-            }
-            return base.Reduce(reducedParents);
-        }
     }
 
     class VFXExpressionPow : VFXExpressionBinaryFloatOperation
diff --git a/package/Editor/Expressions/VFXExpressionRandom.cs b/package/Editor/Expressions/VFXExpressionRandom.cs
index 5ac9e9a17..128e86d24 100755
--- a/package/Editor/Expressions/VFXExpressionRandom.cs
+++ b/package/Editor/Expressions/VFXExpressionRandom.cs
@@ -44,7 +44,8 @@ public override IEnumerable<VFXAttributeInfo> GetNeededAttributes()
     class VFXExpressionFixedRandom : VFXExpression
     {
         public VFXExpressionFixedRandom() : this(VFXValue<uint>.Default) {}
-        public VFXExpressionFixedRandom(VFXExpression hash) : base(VFXExpression.Flags.None, hash) {}
+        public VFXExpressionFixedRandom(VFXExpression hash, bool perElement = false) : base(perElement ? VFXExpression.Flags.PerElement : VFXExpression.Flags.None, hash)
+        {}
 
         public override VFXExpressionOperation operation { get { return VFXExpressionOperation.GenerateFixedRandom; }}
 
@@ -62,7 +63,13 @@ sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
 
         public override string GetCodeString(string[] parents)
         {
-            return string.Format("FixedRand({0})", parents[0]);
+            return string.Format("FixedRand(particleId ^ {0})", parents[0]);
+        }
+
+        public override IEnumerable<VFXAttributeInfo> GetNeededAttributes()
+        {
+            if (Is(Flags.PerElement))
+                yield return new VFXAttributeInfo(VFXAttribute.ParticleId, VFXAttributeMode.Read);
         }
     }
     #pragma warning restore 0659
diff --git a/package/Editor/Expressions/VFXExpressionTransform.cs b/package/Editor/Expressions/VFXExpressionTransform.cs
index 891100510..533de6f68 100755
--- a/package/Editor/Expressions/VFXExpressionTransform.cs
+++ b/package/Editor/Expressions/VFXExpressionTransform.cs
@@ -57,7 +57,7 @@ public VFXExpressionInverseMatrix() : this(VFXValue<Matrix4x4>.Default)
         public VFXExpressionInverseMatrix(VFXExpression parent) : base(VFXExpression.Flags.InvalidOnGPU, parent)
         {}
 
-        sealed public override VFXExpressionOperation operation
+        public override VFXExpressionOperation operation
         {
             get
             {
@@ -72,152 +72,6 @@ sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
         }
     }
 
-    class VFXExpressionTransposeMatrix : VFXExpression
-    {
-        public VFXExpressionTransposeMatrix() : this(VFXValue<Matrix4x4>.Default)
-        {}
-
-        public VFXExpressionTransposeMatrix(VFXExpression parent) : base(Flags.None, parent)
-        {}
-
-        public sealed override VFXExpressionOperation operation
-        {
-            get
-            {
-                return VFXExpressionOperation.TransposeMatrix;
-            }
-        }
-
-        sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
-        {
-            var matrix = constParents[0].Get<Matrix4x4>();
-            return VFXValue.Constant(matrix.transpose);
-        }
-
-        public override string GetCodeString(string[] parents)
-        {
-            return string.Format("transpose({0})", parents[0]);
-        }
-    }
-
-    class VFXExpressionInverseTRSMatrix : VFXExpression
-    {
-        public VFXExpressionInverseTRSMatrix() : this(VFXValue<Matrix4x4>.Default)
-        {}
-
-        public VFXExpressionInverseTRSMatrix(VFXExpression parent) : base(VFXExpression.Flags.None, parent)
-        {}
-
-        sealed public override VFXExpressionOperation operation
-        {
-            get
-            {
-                return VFXExpressionOperation.InverseTRSMatrix;
-            }
-        }
-
-        // Invert 3D transformation matrix (not perspective). Adapted from graphics gems 2.
-        // Inverts upper left by calculating its determinant and multiplying it to the symmetric
-        // adjust matrix of each element. Finally deals with the translation by transforming the
-        // original translation using by the calculated inverse.
-        //https://github.com/erich666/GraphicsGems/blob/master/gemsii/inverse.c
-        static bool inputvertMatrix4x4_General3D(Matrix4x4 input, ref Matrix4x4 output) //*WIP* This function is not exposed, we will add an helper in Matrix4 bindings
-        {
-#if UNITY_2019_2_OR_NEWER
-            return Matrix4x4.Inverse3DAffine(input, ref output);
-#else
-            output = Matrix4x4.identity;
-
-            float pos, neg, t;
-            float det;
-
-            // Calculate the determinant of upper left 3x3 sub-matrix and
-            // determine if the matrix is singular.
-            pos = neg = 0.0f;
-            t =  input[0, 0] * input[1, 1] * input[2, 2];
-            if (t >= 0.0f)
-                pos += t;
-            else
-                neg += t;
-
-            t =  input[1, 0] * input[2, 1] * input[0, 2];
-            if (t >= 0.0f)
-                pos += t;
-            else
-                neg += t;
-
-            t =  input[2, 0] * input[0, 1] * input[1, 2];
-            if (t >= 0.0f)
-                pos += t;
-            else
-                neg += t;
-
-            t = -input[2, 0] * input[1, 1] * input[0, 2];
-            if (t >= 0.0f)
-                pos += t;
-            else
-                neg += t;
-
-            t = -input[1, 0] * input[0, 1] * input[2, 2];
-            if (t >= 0.0f)
-                pos += t;
-            else
-                neg += t;
-
-            t = -input[0, 0] * input[2, 1] * input[1, 2];
-            if (t >= 0.0f)
-                pos += t;
-            else
-                neg += t;
-
-            det = pos + neg;
-
-            if (det * det < 1e-25f)
-                return false;
-
-            det = 1.0f / det;
-            output[0, 0] = (input[1, 1] * input[2, 2] - input[2, 1] * input[1, 2]) * det;
-            output[0, 1] = -(input[0, 1] * input[2, 2] - input[2, 1] * input[0, 2]) * det;
-            output[0, 2] = (input[0, 1] * input[1, 2] - input[1, 1] * input[0, 2]) * det;
-            output[1, 0] = -(input[1, 0] * input[2, 2] - input[2, 0] * input[1, 2]) * det;
-            output[1, 1] = (input[0, 0] * input[2, 2] - input[2, 0] * input[0, 2]) * det;
-            output[1, 2] = -(input[0, 0] * input[1, 2] - input[1, 0] * input[0, 2]) * det;
-            output[2, 0] = (input[1, 0] * input[2, 1] - input[2, 0] * input[1, 1]) * det;
-            output[2, 1] = -(input[0, 0] * input[2, 1] - input[2, 0] * input[0, 1]) * det;
-            output[2, 2] = (input[0, 0] * input[1, 1] - input[1, 0] * input[0, 1]) * det;
-
-            // Do the translation part
-            output[0, 3] = -(input[0, 3] * output[0, 0] + input[1, 3] * output[0, 1] + input[2, 3] * output[0, 2]);
-            output[1, 3] = -(input[0, 3] * output[1, 0] + input[1, 3] * output[1, 1] + input[2, 3] * output[1, 2]);
-            output[2, 3] = -(input[0, 3] * output[2, 0] + input[1, 3] * output[2, 1] + input[2, 3] * output[2, 2]);
-
-            output[3, 0] = 0.0f;
-            output[3, 1] = 0.0f;
-            output[3, 2] = 0.0f;
-            output[3, 3] = 1.0f;
-
-            return true;
-#endif
-        }
-
-        sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
-        {
-            var matrix = constParents[0].Get<Matrix4x4>();
-
-            var result = Matrix4x4.identity;
-            if (!inputvertMatrix4x4_General3D(matrix, ref result))
-            {
-                throw new InvalidOperationException("VFXExpressionInverseTRSMatrix used on a not TRS Matrix");
-            }
-            return VFXValue.Constant(result);
-        }
-
-        public override string GetCodeString(string[] parents)
-        {
-            return string.Format("VFXInverseTRSMatrix({0})", parents[0]);
-        }
-    }
-
     class VFXExpressionExtractPositionFromMatrix : VFXExpression
     {
         public VFXExpressionExtractPositionFromMatrix() : this(VFXValue<Matrix4x4>.Default)
@@ -236,15 +90,6 @@ public override VFXExpressionOperation operation
             }
         }
 
-        protected sealed override VFXExpression Reduce(VFXExpression[] reducedParents)
-        {
-            var parent = reducedParents[0];
-            if (parent is VFXExpressionTRSToMatrix)
-                return parent.parents[0];
-
-            return base.Reduce(reducedParents);
-        }
-
         sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
         {
             var matrixReduce = constParents[0];
@@ -277,15 +122,6 @@ public override VFXExpressionOperation operation
             }
         }
 
-        protected sealed override VFXExpression Reduce(VFXExpression[] reducedParents)
-        {
-            var parent = reducedParents[0];
-            if (parent is VFXExpressionTRSToMatrix)
-                return parent.parents[1];
-
-            return base.Reduce(reducedParents);
-        }
-
         sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
         {
             var matrixReduce = constParents[0];
@@ -313,15 +149,6 @@ public override VFXExpressionOperation operation
             }
         }
 
-        protected sealed override VFXExpression Reduce(VFXExpression[] reducedParents)
-        {
-            var parent = reducedParents[0];
-            if (parent is VFXExpressionTRSToMatrix)
-                return parent.parents[2];
-
-            return base.Reduce(reducedParents);
-        }
-
         sealed protected override VFXExpression Evaluate(VFXExpression[] constParents)
         {
             var matrixReduce = constParents[0];
diff --git a/package/Editor/GraphView/Blackboard/VFXBlackboard.cs b/package/Editor/GraphView/Blackboard/VFXBlackboard.cs
index 40d08aeee..65d60fb09 100755
--- a/package/Editor/GraphView/Blackboard/VFXBlackboard.cs
+++ b/package/Editor/GraphView/Blackboard/VFXBlackboard.cs
@@ -41,6 +41,8 @@ public VFXViewController controller
                     {
                         m_Controller.RegisterHandler(this);
                     }
+
+                    m_AddButton.SetEnabled(m_Controller != null);
                 }
             }
         }
@@ -58,6 +60,8 @@ public VFXViewController controller
 
         VFXView m_View;
 
+        Button m_AddButton;
+
         public VFXBlackboard(VFXView view)
         {
             m_View = view;
@@ -82,6 +86,7 @@ public VFXBlackboard(VFXView view)
 
             focusable = true;
 
+            m_AddButton = this.Q<Button>(name: "addButton");
 
             m_DragIndicator = new VisualElement();
 
@@ -104,6 +109,8 @@ public VFXBlackboard(VFXView view)
 
             if(s_LayoutManual != null)
                 s_LayoutManual.SetValue(this, false);
+
+            m_AddButton.SetEnabled(false);
         }
 
         static System.Reflection.PropertyInfo s_LayoutManual = typeof(VisualElement).GetProperty("isLayoutManual",System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
diff --git a/package/Editor/GraphView/Elements/Controllers/VFXContextController.cs b/package/Editor/GraphView/Elements/Controllers/VFXContextController.cs
index e20941349..75f33ece7 100755
--- a/package/Editor/GraphView/Elements/Controllers/VFXContextController.cs
+++ b/package/Editor/GraphView/Elements/Controllers/VFXContextController.cs
@@ -153,7 +153,7 @@ public void ReorderBlock(int index, VFXBlock block)
         public void RemoveBlock(VFXBlock block)
         {
             model.RemoveChild(block);
-            VFXModel.UnlinkModel(block);
+            VFXModel.UnlinkModel(model);
         }
 
         public int FindBlockIndexOf(VFXBlockController controller)
diff --git a/package/Editor/GraphView/Elements/Controllers/VFXOperatorController.cs b/package/Editor/GraphView/Elements/Controllers/VFXOperatorController.cs
index ffc181984..a9c2a59a2 100755
--- a/package/Editor/GraphView/Elements/Controllers/VFXOperatorController.cs
+++ b/package/Editor/GraphView/Elements/Controllers/VFXOperatorController.cs
@@ -257,9 +257,7 @@ public bool CanRemove()
 
         public void RemoveOperand(VFXDataAnchorController myInput)
         {
-            var slotIndex = model.GetSlotIndex(myInput.model);
-            if (slotIndex != -1)
-                RemoveOperand(slotIndex);
+            RemoveOperand(model.GetSlotIndex(myInput.model));
         }
 
         public void RemoveOperand(int index)
diff --git a/package/Editor/GraphView/Elements/VFXDataAnchor.cs b/package/Editor/GraphView/Elements/VFXDataAnchor.cs
index e75e860ea..f50550fc9 100755
--- a/package/Editor/GraphView/Elements/VFXDataAnchor.cs
+++ b/package/Editor/GraphView/Elements/VFXDataAnchor.cs
@@ -210,6 +210,11 @@ void IEdgeConnectorListener.OnDrop(GraphView graphView, Edge edge)
             VFXDataEdge dataEdge = edge as VFXDataEdge;
             VFXDataEdgeController edgeController = new VFXDataEdgeController(dataEdge.input.controller, dataEdge.output.controller);
 
+            if (dataEdge.controller != null)
+            {
+                view.controller.RemoveElement(dataEdge.controller);
+            }
+
             view.controller.AddElement(edgeController);
         }
 
diff --git a/package/Editor/GraphView/Views/Controller/VFXViewController.cs b/package/Editor/GraphView/Views/Controller/VFXViewController.cs
index 813dd4450..c57a678fe 100755
--- a/package/Editor/GraphView/Views/Controller/VFXViewController.cs
+++ b/package/Editor/GraphView/Views/Controller/VFXViewController.cs
@@ -393,9 +393,8 @@ public void DataEdgesMightHaveChanged()
 
             bool change = RecreateNodeEdges();
 
-            if (change || m_ForceDataEdgeNotification)
+            if (change)
             {
-                m_ForceDataEdgeNotification = false;
                 NotifyChange(Change.dataEdge);
             }
 
@@ -625,7 +624,7 @@ public void AddElement(VFXFlowEdgeController edge)
             edge.OnDisable();
         }
 
-        public void Remove(IEnumerable<Controller> removedControllers, bool explicitDelete = false)
+        public void Remove(IEnumerable<Controller> removedControllers)
         {
             var removedContexts = new HashSet<VFXContextController>(removedControllers.OfType<VFXContextController>());
 
@@ -634,13 +633,11 @@ public void Remove(IEnumerable<Controller> removedControllers, bool explicitDele
 
             foreach (var controller in removed)
             {
-                RemoveElement(controller, explicitDelete);
+                RemoveElement(controller);
             }
         }
 
-        bool m_ForceDataEdgeNotification;
-
-        public void RemoveElement(Controller element, bool explicitDelete = false)
+        public void RemoveElement(Controller element)
         {
             if (element is VFXContextController)
             {
@@ -749,16 +746,12 @@ public void RemoveElement(Controller element, bool explicitDelete = false)
 
                 if (to != null)
                 {
-                    if( explicitDelete )
-                    {
-                        to.sourceNode.OnEdgeGoingToBeRemoved(to);
-                    }
+                    to.sourceNode.OnEdgeGoingToBeRemoved(to);
                     var slot = to.model;
                     if (slot != null)
                     {
                         slot.UnlinkAll();
                     }
-                    m_ForceDataEdgeNotification = true;
                 }
             }
             else if (element is VFXGroupNodeController)
@@ -1874,7 +1867,7 @@ public void UpdateSystems()
 
                 VFXContextType type = VFXContextType.kNone;
                 VFXContext prevContext = null;
-                var orderedContexts = systems[i].Keys.OrderBy(t => t.contextType).ThenBy(t => systems[i][t]).ThenBy(t => t.position.x).ThenBy(t => t.position.y).ToArray();
+                var orderedContexts = contextToController.Keys.OrderBy(t => t.contextType).ThenBy(t => systems[i][t]).ThenBy(t => t.position.x).ThenBy(t => t.position.y).ToArray();
 
                 char letter = 'A';
                 foreach (var context in orderedContexts)
diff --git a/package/Editor/GraphView/Views/Controller/VFXViewControllerUndo.cs b/package/Editor/GraphView/Views/Controller/VFXViewControllerUndo.cs
index b71c6cd08..08f726405 100755
--- a/package/Editor/GraphView/Views/Controller/VFXViewControllerUndo.cs
+++ b/package/Editor/GraphView/Views/Controller/VFXViewControllerUndo.cs
@@ -122,8 +122,11 @@ public void IncremenentGraphUndoRedoState(VFXModel model, VFXModel.InvalidationC
                 return;
             }
 
-            if (cause == VFXModel.InvalidationCause.kExpressionInvalidated ||   // Ignore invalidation which doesn't modify model
-                cause == VFXModel.InvalidationCause.kExpressionGraphChanged)
+            if (cause != VFXModel.InvalidationCause.kStructureChanged &&
+                cause != VFXModel.InvalidationCause.kConnectionChanged &&
+                cause != VFXModel.InvalidationCause.kParamChanged &&
+                cause != VFXModel.InvalidationCause.kSettingChanged &&
+                cause != VFXModel.InvalidationCause.kUIChanged)
                 return;
 
             if (m_reentrant)
diff --git a/package/Editor/GraphView/Views/VFXView.cs b/package/Editor/GraphView/Views/VFXView.cs
index 47f1038d1..21c5433a8 100755
--- a/package/Editor/GraphView/Views/VFXView.cs
+++ b/package/Editor/GraphView/Views/VFXView.cs
@@ -439,7 +439,7 @@ void Delete(string cmd, AskUser askUser)
             {
                 parametersToRemove = parametersToRemove.Concat(controller.RemoveCategory(m_Blackboard.GetCategoryIndex(category)));
             }
-            controller.Remove(selection.OfType<IControlledElement>().Select(t => t.controller).Concat(parametersToRemove.Cast<Controller>()), true);
+            controller.Remove(selection.OfType<IControlledElement>().Select(t => t.controller).Concat(parametersToRemove.Cast<Controller>()));
         }
 
         void IControlledElement.OnControllerChanged(ref ControllerChangedEvent e)
@@ -1139,12 +1139,6 @@ GraphViewChange VFXGraphViewChanged(GraphViewChange change)
             else if (change.elementsToRemove != null)
             {
                 controller.Remove(change.elementsToRemove.OfType<IControlledElement>().Where(t => t.controller != null).Select(t => t.controller));
-                
-                foreach( var dataEdge in change.elementsToRemove.OfType<VFXDataEdge>())
-                {
-                    RemoveElement(dataEdge);
-                    dataEdges.Remove(dataEdge.controller);
-                }
             }
 
             return change;
diff --git a/package/Editor/Inspector/AdvancedVisualEffectEditor.cs b/package/Editor/Inspector/AdvancedVisualEffectEditor.cs
index efff27a24..f7bb37c98 100755
--- a/package/Editor/Inspector/AdvancedVisualEffectEditor.cs
+++ b/package/Editor/Inspector/AdvancedVisualEffectEditor.cs
@@ -157,18 +157,20 @@ void OnEditModeEnd(IToolModeOwner owner)
 
         protected override void AssetField()
         {
-            var component = (VisualEffect)target;
             using (new GUILayout.HorizontalScope())
             {
                 EditorGUILayout.PropertyField(m_VisualEffectAsset, Contents.assetPath);
 
-                GUI.enabled = component.visualEffectAsset != null; // Enabled state will be kept for all content until the end of the inspectorGUI.
+                GUI.enabled = ! m_VisualEffectAsset.hasMultipleDifferentValues && m_VisualEffectAsset.objectReferenceValue != null; // Enabled state will be kept for all content until the end of the inspectorGUI.
                 if (GUILayout.Button(Contents.openEditor, EditorStyles.miniButton, Styles.MiniButtonWidth))
                 {
                     VFXViewWindow window = EditorWindow.GetWindow<VFXViewWindow>();
 
-                    window.LoadAsset(component.visualEffectAsset, component);
+                    var asset = m_VisualEffectAsset.objectReferenceValue as VisualEffectAsset;
+
+                    window.LoadAsset(asset, targets.Length > 1 ? null : target as VisualEffect);
                 }
+                GUI.enabled = true;
             }
         }
 
diff --git a/package/Editor/Inspector/VFXAssetEditor.cs b/package/Editor/Inspector/VFXAssetEditor.cs
index 5948f6f04..f19becbeb 100755
--- a/package/Editor/Inspector/VFXAssetEditor.cs
+++ b/package/Editor/Inspector/VFXAssetEditor.cs
@@ -428,8 +428,6 @@ private string UpdateModeToString(VFXUpdateMode mode)
     SerializedProperty prewarmDeltaTime;
     SerializedProperty prewarmStepCount;
 
-    private static readonly float k_MinimalCommonDeltaTime = 1.0f / 800.0f;
-
     public override void OnInspectorGUI()
     {
         resourceObject.Update();
@@ -460,91 +458,14 @@ public override void OnInspectorGUI()
 
         if (prewarmDeltaTime!= null && prewarmStepCount != null)
         {
-            if (!prewarmDeltaTime.hasMultipleDifferentValues && !prewarmStepCount.hasMultipleDifferentValues)
+            EditorGUI.BeginChangeCheck();
+            EditorGUI.showMixedValue = prewarmDeltaTime.hasMultipleDifferentValues;
+            EditorGUILayout.PropertyField(prewarmDeltaTime, EditorGUIUtility.TrTextContent("PreWarm Delta Time"));
+            EditorGUI.showMixedValue = prewarmStepCount.hasMultipleDifferentValues;
+            EditorGUILayout.PropertyField(prewarmStepCount, EditorGUIUtility.TrTextContent("PreWarm Step Count"));
+            if (EditorGUI.EndChangeCheck())
             {
-                var currentDeltaTime = prewarmDeltaTime.floatValue;
-                var currentStepCount = prewarmStepCount.intValue;
-                var currentTotalTime = currentDeltaTime * currentStepCount;
-                EditorGUI.BeginChangeCheck();
-                currentTotalTime = EditorGUILayout.FloatField(EditorGUIUtility.TrTextContent("PreWarm Total Time"), currentTotalTime);
-                if (EditorGUI.EndChangeCheck())
-                {
-                    if (currentStepCount <= 0)
-                    {
-                        prewarmStepCount.intValue = currentStepCount = 1;
-                    }
-
-                    currentDeltaTime = currentTotalTime / currentStepCount;
-                    prewarmDeltaTime.floatValue = currentDeltaTime;
-                    resourceObject.ApplyModifiedProperties();
-                }
-
-                EditorGUI.BeginChangeCheck();
-                currentStepCount = EditorGUILayout.IntField(EditorGUIUtility.TrTextContent("PreWarm Step Count"), currentStepCount);
-                if (EditorGUI.EndChangeCheck())
-                {
-                    if (currentStepCount <= 0 && currentTotalTime != 0.0f)
-                    {
-                        prewarmStepCount.intValue = currentStepCount = 1;
-                    }
-                    
-                    currentDeltaTime = currentTotalTime == 0.0f ? 0.0f : currentTotalTime / currentStepCount;
-                    prewarmDeltaTime.floatValue = currentDeltaTime;
-                    prewarmStepCount.intValue = currentStepCount;
-                    resourceObject.ApplyModifiedProperties();
-                }
-
-                EditorGUI.BeginChangeCheck();
-                currentDeltaTime = EditorGUILayout.FloatField(EditorGUIUtility.TrTextContent("PreWarm Delta Time"), currentDeltaTime);
-                if (EditorGUI.EndChangeCheck())
-                {
-                    if (currentDeltaTime < k_MinimalCommonDeltaTime)
-                    {
-                        prewarmDeltaTime.floatValue = currentDeltaTime = k_MinimalCommonDeltaTime;
-                    }
-
-                    if (currentDeltaTime > currentTotalTime)
-                    {
-                        currentTotalTime = currentDeltaTime;
-                    }
-
-                    if (currentTotalTime != 0.0f)
-                    {
-                        var candidateStepCount_A = Mathf.FloorToInt(currentTotalTime / currentDeltaTime);
-                        var candidateStepCount_B = Mathf.RoundToInt(currentTotalTime / currentDeltaTime);
-
-                        var totalTime_A = currentDeltaTime * candidateStepCount_A;
-                        var totalTime_B = currentDeltaTime * candidateStepCount_B;
-
-                        if (Mathf.Abs(totalTime_A - currentTotalTime) < Mathf.Abs(totalTime_B - currentTotalTime))
-                        {
-                            currentStepCount = candidateStepCount_A;
-                        }
-                        else
-                        {
-                            currentStepCount = candidateStepCount_B;
-                        }
-
-                        prewarmStepCount.intValue = currentStepCount;
-                    }
-                    prewarmDeltaTime.floatValue = currentDeltaTime;
-                    resourceObject.ApplyModifiedProperties();
-                }
-            }
-            else
-            {
-                //Multi selection case, can't resolve total time easily
-                EditorGUI.BeginChangeCheck();
-                EditorGUI.showMixedValue = prewarmStepCount.hasMultipleDifferentValues;
-                EditorGUILayout.PropertyField(prewarmStepCount, EditorGUIUtility.TrTextContent("PreWarm Step Count"));
-                EditorGUI.showMixedValue = prewarmDeltaTime.hasMultipleDifferentValues;
-                EditorGUILayout.PropertyField(prewarmDeltaTime, EditorGUIUtility.TrTextContent("PreWarm Delta Time"));
-                if (EditorGUI.EndChangeCheck())
-                {
-                    if (prewarmDeltaTime.floatValue < k_MinimalCommonDeltaTime)
-                        prewarmDeltaTime.floatValue = k_MinimalCommonDeltaTime;
-                    resourceObject.ApplyModifiedProperties();
-                }
+                resourceObject.ApplyModifiedProperties();
             }
         }
 
diff --git a/package/Editor/Inspector/VFXManagerEditor.cs b/package/Editor/Inspector/VFXManagerEditor.cs
index 251d5ed8b..d76076d60 100755
--- a/package/Editor/Inspector/VFXManagerEditor.cs
+++ b/package/Editor/Inspector/VFXManagerEditor.cs
@@ -17,9 +17,17 @@
 [CustomEditor(typeof(UnityEditor.VFXManager))]
 public class VFXManagerEditor : Editor
 {
+
+    SerializedProperty m_PathProperty;
+    SerializedProperty[] m_TimeProperties;
+    SerializedProperty[] m_ShaderProperties;
     void OnEnable()
     {
+        m_PathProperty = serializedObject.FindProperty("m_RenderPipeSettingsPath");
+        m_TimeProperties = new SerializedProperty[]{ serializedObject.FindProperty("m_FixedTimeStep"), serializedObject.FindProperty("m_MaxDeltaTime")};
+        m_ShaderProperties = new SerializedProperty[]{ serializedObject.FindProperty("m_IndirectShader"), serializedObject.FindProperty("m_CopyBufferShader"), serializedObject.FindProperty("m_SortShader")};
         CheckVFXManager();
+        serializedObject.Update();
     }
 
     void OnDisable()
@@ -28,20 +36,23 @@ void OnDisable()
 
     public override void OnInspectorGUI()
     {
+        // trying to detect a C++ reset by checking if all shaders have been reset to null and the path to ""
+        if( string.IsNullOrEmpty(m_PathProperty.stringValue) && ! m_ShaderProperties.Any(t=>t.objectReferenceValue != null))
+            CheckVFXManager();
         serializedObject.Update();
-        var pathProperty = serializedObject.FindProperty("m_RenderPipeSettingsPath");
+        
         EditorGUI.BeginChangeCheck();
-        EditorGUILayout.LabelField(ObjectNames.NicifyVariableName(pathProperty.name));
-        string resultPath = GUILayout.TextArea(pathProperty.stringValue, 500, GUILayout.Height(30));
+        EditorGUILayout.LabelField(ObjectNames.NicifyVariableName(m_PathProperty.name));
+        string resultPath = GUILayout.TextArea(m_PathProperty.stringValue, 500, GUILayout.Height(30));
         if (EditorGUI.EndChangeCheck())
         {
-            pathProperty.stringValue = resultPath;
+            m_PathProperty.stringValue = resultPath;
         }
 
         GUILayout.BeginHorizontal();
         if (GUILayout.Button("Default"))
         {
-            pathProperty.stringValue = "Packages/com.unity.visualeffectgraph/Shaders/RenderPipeline/HDRP";
+            m_PathProperty.stringValue = "Packages/com.unity.visualeffectgraph/Shaders/RenderPipeline/HDRP";
         }
         if (GUILayout.Button("Reveal"))
         {
@@ -50,17 +61,15 @@ public override void OnInspectorGUI()
         GUILayout.EndHorizontal();
         GUILayout.Space(15);
 
-        foreach (var propertyName in new string[] { "m_FixedTimeStep", "m_MaxDeltaTime" })
+        foreach (var property in m_TimeProperties)
         {
-            var property = serializedObject.FindProperty(propertyName);
             EditorGUILayout.PropertyField(property);
         }
 
         GUILayout.Space(15);
 
-        foreach (var propertyName in new string[] { "m_IndirectShader", "m_CopyBufferShader", "m_SortShader" })
+        foreach (var property in m_ShaderProperties)
         {
-            var property = serializedObject.FindProperty(propertyName);
             EditorGUILayout.PropertyField(property);
         }
         serializedObject.ApplyModifiedProperties();
diff --git a/package/Editor/Inspector/VisualEffectEditor.cs b/package/Editor/Inspector/VisualEffectEditor.cs
index cd927884f..1947b45c8 100755
--- a/package/Editor/Inspector/VisualEffectEditor.cs
+++ b/package/Editor/Inspector/VisualEffectEditor.cs
@@ -440,7 +440,6 @@ public static bool ShowHeader(GUIContent nameContent, bool hasHeader, bool hasFo
 
         protected virtual void AssetField()
         {
-            var component = (VisualEffect)target;
             EditorGUILayout.PropertyField(m_VisualEffectAsset, Contents.assetPath);
         }
 
@@ -451,13 +450,20 @@ protected virtual bool SeedField()
             EditorGUI.BeginChangeCheck();
             using (new GUILayout.HorizontalScope())
             {
-                using (new EditorGUI.DisabledGroupScope(m_ReseedOnPlay.boolValue))
+                using (new EditorGUI.DisabledGroupScope(m_ReseedOnPlay.boolValue || m_ReseedOnPlay.hasMultipleDifferentValues))
                 {
                     EditorGUILayout.PropertyField(m_RandomSeed, Contents.randomSeed);
                     if (GUILayout.Button(Contents.setRandomSeed, EditorStyles.miniButton, Styles.MiniButtonWidth))
                     {
-                        m_RandomSeed.intValue = UnityEngine.Random.Range(0, int.MaxValue);
-                        component.startSeed = (uint)m_RandomSeed.intValue; // As accessors are bypassed with serialized properties...
+                        foreach( VisualEffect ve in targets)
+                        {
+                            var singleSerializedObject = new SerializedObject(ve);
+                            var singleProperty = singleSerializedObject.FindProperty("m_StartSeed");
+                            singleProperty.intValue = UnityEngine.Random.Range(0, int.MaxValue);
+                            singleSerializedObject.ApplyModifiedProperties();
+                            ve.startSeed = (uint)singleProperty.intValue;
+                        }
+                        serializedObject.Update();
                     }
                 }
             }
@@ -470,29 +476,18 @@ public override void OnInspectorGUI()
             AssetField();
             bool reinit = SeedField();
 
-
-            var component = (VisualEffect)target;
-            //Display properties only if all the VisualEffects share the same graph
-            VisualEffectAsset asset = component.visualEffectAsset;
-            if (targets.Length > 1)
+            if (! m_VisualEffectAsset.hasMultipleDifferentValues)
             {
-                foreach (VisualEffect effect in targets)
-                {
-                    if (effect.visualEffectAsset != asset)
-                    {
-                        return;
-                    }
-                }
-            }
-
-            EditorModeInspectorButton();
+                EditorModeInspectorButton();
 
-            DrawRendererProperties();
-            DrawParameters();
+                DrawRendererProperties();
+                DrawParameters();
+            }
 
             serializedObject.ApplyModifiedProperties();
             if (reinit)
             {
+                foreach( VisualEffect component in targets)
                 component.Reinit();
             }
 
diff --git a/package/Editor/Models/Blocks/Implementations/Collision/CollisionBase.cs b/package/Editor/Models/Blocks/Implementations/Collision/CollisionBase.cs
index b1bd9ef54..10c726235 100755
--- a/package/Editor/Models/Blocks/Implementations/Collision/CollisionBase.cs
+++ b/package/Editor/Models/Blocks/Implementations/Collision/CollisionBase.cs
@@ -161,7 +161,7 @@ public class RoughnessProperties
 
         public class RadiusProperties
         {
-            [Tooltip("The radius of the particle used for collision detection.")]
+            [Tooltip("How much to randomly adjust the normal after a collision.")]
             public float radius = 0.1f;
         }
     }
diff --git a/package/Editor/Models/Blocks/Implementations/Collision/CollisionDepth.cs b/package/Editor/Models/Blocks/Implementations/Collision/CollisionDepth.cs
index 9aa8b521a..6871921af 100755
--- a/package/Editor/Models/Blocks/Implementations/Collision/CollisionDepth.cs
+++ b/package/Editor/Models/Blocks/Implementations/Collision/CollisionDepth.cs
@@ -14,14 +14,17 @@ enum SurfaceThickness
             Custom,
         }
 
-        [VFXSetting]
-        public CameraMode camera;
-
         [VFXSetting, SerializeField]
         SurfaceThickness surfaceThickness = SurfaceThickness.Infinite;
 
         public override string name { get { return "Collider (Depth)"; } }
 
+        public class InputProperties
+        {
+            public CameraType Camera = CameraType.defaultValue;
+            public Texture2D DepthBuffer = null;
+        }
+
         public class ThicknessProperties
         {
             [Min(0.0f)]
@@ -44,8 +47,6 @@ protected override IEnumerable<VFXPropertyWithValue> inputProperties
             get
             {
                 var inputs = base.inputProperties;
-                if (camera == CameraMode.Custom)
-                    inputs = inputs.Concat(PropertiesFromType(typeof(CameraHelper.CameraProperties)));
                 if (surfaceThickness == SurfaceThickness.Custom)
                     inputs = inputs.Concat(PropertiesFromType("ThicknessProperties"));
                 return inputs;
@@ -56,24 +57,28 @@ public override IEnumerable<VFXNamedExpression> parameters
         {
             get
             {
-                var expressions = CameraHelper.AddCameraExpressions(base.parameters, camera);
+                var expressions = base.parameters;
 
-                CameraMatricesExpressions camMat = CameraHelper.GetMatricesExpressions(expressions);
+                var fov = expressions.First(e => e.name == "Camera_fieldOfView");
+                var aspect = expressions.First(e => e.name == "Camera_aspectRatio");
+                var near = expressions.First(e => e.name == "Camera_nearPlane");
+                var far = expressions.First(e => e.name == "Camera_farPlane");
+                var cameraMatrix = expressions.First(e => e.name == "Camera_transform");
 
-                // Filter unused expressions
-                expressions = expressions.Where(t =>
-                    t.name != "Camera_fieldOfView" &&
-                    t.name != "Camera_aspectRatio" &&
-                    t.name != "Camera_transform" &&
-                    t.name != "Camera_colorBuffer");
+                expressions = expressions.Where(t => !(t.Equals(fov) || t.Equals(aspect) || t.Equals(cameraMatrix)));
 
                 foreach (var e in expressions)
                     yield return e;
 
-                yield return camMat.ViewToVFX;
-                yield return camMat.VFXToView;
-                yield return camMat.ViewToClip;
-                yield return camMat.ClipToView;
+                VFXExpression ViewToVFX = cameraMatrix.exp;
+                VFXExpression VFXToView = new VFXExpressionInverseMatrix(ViewToVFX);
+                VFXExpression ViewToClip = VFXOperatorUtility.GetPerspectiveMatrix(fov.exp, aspect.exp, near.exp, far.exp);
+                VFXExpression ClipToView = new VFXExpressionInverseMatrix(ViewToClip);
+
+                yield return new VFXNamedExpression(ViewToVFX, "ViewToVFX");
+                yield return new VFXNamedExpression(VFXToView, "VFXToView");
+                yield return new VFXNamedExpression(ViewToClip, "ViewToClip");
+                yield return new VFXNamedExpression(ClipToView, "ClipToView");
             }
         }
 
@@ -92,7 +97,7 @@ public override string source
 if (aProjPos.x < 1.0f && aProjPos.y < 1.0f) // visible on screen
 {
     float2 uv = projPos.xy * 0.5f + 0.5f;
-    float depth = LoadTexture(Camera_depthBuffer,int3(uv*Camera_pixelDimensions, 0)).r;
+    float depth = LoadTexture(DepthBuffer,int3(uv*Camera_pixelDimensions, 0)).r;
     #if UNITY_REVERSED_Z
     depth = 1.0f - depth; // reversed z
     #endif
@@ -118,8 +123,8 @@ public override string source
         int2 depthPos10 = clamp(int2((projPos10 * 0.5f + 0.5f) * Camera_pixelDimensions), 0, Camera_pixelDimensions - 1);
         int2 depthPos01 = clamp(int2((projPos01 * 0.5f + 0.5f) * Camera_pixelDimensions), 0, Camera_pixelDimensions - 1);
 
-        float depth10 = LoadTexture(Camera_depthBuffer, int3(depthPos10, 0)).r;
-        float depth01 = LoadTexture(Camera_depthBuffer, int3(depthPos01, 0)).r;
+        float depth10 = LoadTexture(DepthBuffer, int3(depthPos10, 0)).r;
+        float depth01 = LoadTexture(DepthBuffer, int3(depthPos01, 0)).r;
 
         #if UNITY_REVERSED_Z
         depth10 = 1.0f - depth10;
diff --git a/package/Editor/Models/Blocks/Implementations/Forces/ConformToSDF.cs b/package/Editor/Models/Blocks/Implementations/Forces/ConformToSDF.cs
index 29b907fc6..db40af052 100755
--- a/package/Editor/Models/Blocks/Implementations/Forces/ConformToSDF.cs
+++ b/package/Editor/Models/Blocks/Implementations/Forces/ConformToSDF.cs
@@ -19,7 +19,7 @@ public override IEnumerable<VFXNamedExpression> parameters
                 foreach (var input in GetExpressionsFromSlots(this))
                 {
                     if (input.name == "FieldTransform")
-                        yield return new VFXNamedExpression(new VFXExpressionInverseTRSMatrix(input.exp), "InvFieldTransform");
+                        yield return new VFXNamedExpression(new VFXExpressionInverseMatrix(input.exp), "InvFieldTransform");
                     yield return input;
                 }
 
diff --git a/package/Editor/Models/Blocks/Implementations/Position/PositionSequential.cs b/package/Editor/Models/Blocks/Implementations/Position/PositionSequential.cs
index 3bf00f21d..517433c33 100755
--- a/package/Editor/Models/Blocks/Implementations/Position/PositionSequential.cs
+++ b/package/Editor/Models/Blocks/Implementations/Position/PositionSequential.cs
@@ -20,7 +20,7 @@ protected override sealed Dictionary<string, object[]> variants
         }
     }
 
-    [VFXInfo(category = "Position", variantProvider = typeof(PositionSequentialVariantProvider), experimental = true)]
+    [VFXInfo(category = "Position", variantProvider = typeof(PositionSequentialVariantProvider))]
     class PositionSequential : VFXBlock
     {
         public enum SequentialShape
@@ -55,9 +55,6 @@ public enum IndexMode
         [Tooltip("Write target position")]
         private bool writeTargetPosition = false;
 
-        [SerializeField, VFXSetting]
-        private VFXOperatorUtility.SequentialAddressingMode mode = VFXOperatorUtility.SequentialAddressingMode.Wrap;
-
         public override string name { get { return string.Format("Position : Sequential ({0})", shape); } }
         public override VFXContextType compatibleContexts { get { return VFXContextType.kInitAndUpdateAndOutput; } }
         public override VFXDataType compatibleData { get { return VFXDataType.kParticle; } }
@@ -172,7 +169,7 @@ private VFXExpression GetPositionFromIndex(VFXExpression indexExpr, IEnumerable<
                 var start = expressions.First(o => o.name == "Start").exp;
                 var end = expressions.First(o => o.name == "End").exp;
                 var count = expressions.First(o => o.name == "Count").exp;
-                return VFXOperatorUtility.SequentialLine(start, end, indexExpr, count, mode);
+                return VFXOperatorUtility.SequentialLine(start, end, indexExpr, count);
             }
             else if (shape == SequentialShape.Circle)
             {
@@ -181,7 +178,7 @@ private VFXExpression GetPositionFromIndex(VFXExpression indexExpr, IEnumerable<
                 var up = expressions.First(o => o.name == "Up").exp;
                 var radius = expressions.First(o => o.name == "Radius").exp;
                 var count = expressions.First(o => o.name == "Count").exp;
-                return VFXOperatorUtility.SequentialCircle(center, radius, normal, up, indexExpr, count, mode);
+                return VFXOperatorUtility.SequentialCircle(center, radius, normal, up, indexExpr, count);
             }
             else if (shape == SequentialShape.ThreeDimensional)
             {
@@ -192,7 +189,7 @@ private VFXExpression GetPositionFromIndex(VFXExpression indexExpr, IEnumerable<
                 var countX = expressions.First(o => o.name == "CountX").exp;
                 var countY = expressions.First(o => o.name == "CountY").exp;
                 var countZ = expressions.First(o => o.name == "CountZ").exp;
-                return VFXOperatorUtility.Sequential3D(origin, axisX, axisY, axisZ, indexExpr, countX, countY, countZ, mode);
+                return VFXOperatorUtility.Sequential3D(origin, axisX, axisY, axisZ, indexExpr, countX, countY, countZ);
             }
             throw new NotImplementedException();
         }
diff --git a/package/Editor/Models/Blocks/Implementations/SetAttribute.cs b/package/Editor/Models/Blocks/Implementations/SetAttribute.cs
index 7f66bd47c..2103784c4 100755
--- a/package/Editor/Models/Blocks/Implementations/SetAttribute.cs
+++ b/package/Editor/Models/Blocks/Implementations/SetAttribute.cs
@@ -231,55 +231,54 @@ protected override IEnumerable<VFXPropertyWithValue> inputProperties
         {
             get
             {
-                if (Source != ValueSource.Source)
-                {
-                    var attrib = currentAttribute;
+                if (Source == ValueSource.Source) yield break;
 
-                    VFXPropertyAttribute[] attr = null;
-                    if (attrib.Equals(VFXAttribute.Color))
-                        attr = VFXPropertyAttribute.Create(new ShowAsColorAttribute());
+                var attrib = currentAttribute;
 
-                    Type slotType = VFXExpression.TypeToType(attrib.type);
-                    object content = attrib.value.GetContent();
-                    if (attrib.variadic == VFXVariadic.True)
-                    {
-                        string channelsString = channels.ToString();
+                VFXPropertyAttribute[] attr = null;
+                if (attrib.Equals(VFXAttribute.Color))
+                    attr = VFXPropertyAttribute.Create(new ShowAsColorAttribute());
 
-                        int length = channelsString.Length;
-                        switch (length)
-                        {
-                            case 1:
-                                slotType = typeof(float);
-                                content = ((Vector3)content)[ChannelToIndex(channelsString[0])];
-                                break;
-                            case 2:
-                                slotType = typeof(Vector2);
-                                Vector2 v = (Vector2)(Vector3)content;
-                                for (int i = 0; i < 2; i++)
-                                    v[i] = ((Vector3)content)[ChannelToIndex(channelsString[i])];
-                                content = v;
-                                break;
-                            case 3:
-                                slotType = typeof(Vector3);
-                                break;
-                            default:
-                                break;
-                        }
-                    }
+                Type slotType = VFXExpression.TypeToType(attrib.type);
+                object content = attrib.value.GetContent();
+                if (attrib.variadic == VFXVariadic.True)
+                {
+                    string channelsString = channels.ToString();
 
-                    if (Random == RandomMode.Off)
+                    int length = channelsString.Length;
+                    switch (length)
                     {
-                        yield return new VFXPropertyWithValue(new VFXProperty(slotType, GenerateLocalAttributeName(attrib.name)) { attributes = attr }, content);
-                    }
-                    else
-                    {
-                        yield return new VFXPropertyWithValue(new VFXProperty(slotType, "Min") { attributes = attr }, content);
-                        yield return new VFXPropertyWithValue(new VFXProperty(slotType, "Max") { attributes = attr }, content);
+                        case 1:
+                            slotType = typeof(float);
+                            content = ((Vector3)content)[ChannelToIndex(channelsString[0])];
+                            break;
+                        case 2:
+                            slotType = typeof(Vector2);
+                            Vector2 v = (Vector2)(Vector3)content;
+                            for (int i = 0; i < 2; i++)
+                                v[i] = ((Vector3)content)[ChannelToIndex(channelsString[i])];
+                            content = v;
+                            break;
+                        case 3:
+                            slotType = typeof(Vector3);
+                            break;
+                        default:
+                            break;
                     }
                 }
 
+                if (Random == RandomMode.Off)
+                {
+                    yield return new VFXPropertyWithValue(new VFXProperty(slotType, GenerateLocalAttributeName(attrib.name)) { attributes = attr }, content);
+                }
+                else
+                {
+                    yield return new VFXPropertyWithValue(new VFXProperty(slotType, "Min") { attributes = attr }, content);
+                    yield return new VFXPropertyWithValue(new VFXProperty(slotType, "Max") { attributes = attr }, content);
+                }
+
                 if (Composition == AttributeCompositionMode.Blend)
-                    yield return new VFXPropertyWithValue(new VFXProperty(typeof(float), "Blend", VFXPropertyAttribute.Create(new RangeAttribute(0.0f, 1.0f))));
+                    yield return new VFXPropertyWithValue(new VFXProperty(typeof(float), "Blend"));
             }
         }
 
diff --git a/package/Editor/Models/Operators/Implementations/MainCamera.cs b/package/Editor/Models/Operators/Implementations/MainCamera.cs
index 5efb10ec9..b46dea082 100755
--- a/package/Editor/Models/Operators/Implementations/MainCamera.cs
+++ b/package/Editor/Models/Operators/Implementations/MainCamera.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using UnityEngine;
-using UnityEngine.Experimental.VFX;
 
 namespace UnityEditor.VFX.Operator
 {
@@ -31,10 +30,8 @@ protected override sealed VFXExpression[] BuildExpression(VFXExpression[] inputE
             VFXExpression farPlane = new VFXExpressionExtractFarPlaneFromMainCamera();
             VFXExpression aspectRatio = new VFXExpressionExtractAspectRatioFromMainCamera();
             VFXExpression pixelDimensions = new VFXExpressionExtractPixelDimensionsFromMainCamera();
-            VFXExpression depthBuffer = new VFXExpressionGetBufferFromMainCamera(VFXCameraBufferTypes.Depth);
-            VFXExpression colorBuffer = new VFXExpressionGetBufferFromMainCamera(VFXCameraBufferTypes.Color);
 
-            return new[] { matrix, fov, nearPlane, farPlane, aspectRatio, pixelDimensions, depthBuffer, colorBuffer };
+            return new[] { matrix, fov, nearPlane, farPlane, aspectRatio, pixelDimensions };
         }
     }
 }
diff --git a/package/Editor/Models/Operators/Implementations/OrientedBoxVolume.cs b/package/Editor/Models/Operators/Implementations/OrientedBoxVolume.cs
index 2094ce79b..f38b170b8 100755
--- a/package/Editor/Models/Operators/Implementations/OrientedBoxVolume.cs
+++ b/package/Editor/Models/Operators/Implementations/OrientedBoxVolume.cs
@@ -23,7 +23,7 @@ public class OutputProperties
 
         protected override sealed VFXExpression[] BuildExpression(VFXExpression[] inputExpression)
         {
-            return new VFXExpression[] { VFXOperatorUtility.BoxVolume(new VFXExpressionExtractScaleFromMatrix(inputExpression[0])) };
+            return new VFXExpression[] { VFXOperatorUtility.BoxVolume(inputExpression[2]) };
         }
     }
 }
diff --git a/package/Editor/Models/Operators/Implementations/Sequential3D.cs b/package/Editor/Models/Operators/Implementations/Sequential3D.cs
index 37590c0c2..9c1cef275 100755
--- a/package/Editor/Models/Operators/Implementations/Sequential3D.cs
+++ b/package/Editor/Models/Operators/Implementations/Sequential3D.cs
@@ -38,9 +38,6 @@ public override string name
             }
         }
 
-        [SerializeField, VFXSetting]
-        private VFXOperatorUtility.SequentialAddressingMode mode = VFXOperatorUtility.SequentialAddressingMode.Wrap;
-
         protected override VFXExpression[] BuildExpression(VFXExpression[] inputExpression)
         {
             var index = inputExpression[0];
@@ -52,7 +49,7 @@ protected override VFXExpression[] BuildExpression(VFXExpression[] inputExpressi
             var axisY = inputExpression[6];
             var axisZ = inputExpression[7];
 
-            return new[] { VFXOperatorUtility.Sequential3D(origin, axisX, axisY, axisZ, index, countX, countY, countZ, mode) };
+            return new[] { VFXOperatorUtility.Sequential3D(origin, axisX, axisY, axisZ, index, countX, countY, countZ) };
         }
     }
 }
diff --git a/package/Editor/Models/Operators/Implementations/SequentialCircle.cs b/package/Editor/Models/Operators/Implementations/SequentialCircle.cs
index c3652b65e..599ff4381 100755
--- a/package/Editor/Models/Operators/Implementations/SequentialCircle.cs
+++ b/package/Editor/Models/Operators/Implementations/SequentialCircle.cs
@@ -36,9 +36,6 @@ public override string name
             }
         }
 
-        [SerializeField, VFXSetting]
-        private VFXOperatorUtility.SequentialAddressingMode mode = VFXOperatorUtility.SequentialAddressingMode.Wrap;
-
         protected override VFXExpression[] BuildExpression(VFXExpression[] inputExpression)
         {
             var index = inputExpression[0];
@@ -48,7 +45,7 @@ protected override VFXExpression[] BuildExpression(VFXExpression[] inputExpressi
             var up = inputExpression[4];
             var radius = inputExpression[5];
 
-            return new[] { VFXOperatorUtility.SequentialCircle(center, radius, normal, up, index, count, mode) };
+            return new[] { VFXOperatorUtility.SequentialCircle(center, radius, normal, up, index, count) };
         }
     }
 }
diff --git a/package/Editor/Models/Operators/Implementations/SequentialLine.cs b/package/Editor/Models/Operators/Implementations/SequentialLine.cs
index f173b7fd9..a7012d376 100755
--- a/package/Editor/Models/Operators/Implementations/SequentialLine.cs
+++ b/package/Editor/Models/Operators/Implementations/SequentialLine.cs
@@ -32,9 +32,6 @@ public override string name
             }
         }
 
-        [SerializeField, VFXSetting]
-        private VFXOperatorUtility.SequentialAddressingMode mode = VFXOperatorUtility.SequentialAddressingMode.Wrap;
-
         protected override VFXExpression[] BuildExpression(VFXExpression[] inputExpression)
         {
             var index = inputExpression[0];
@@ -42,7 +39,7 @@ protected override VFXExpression[] BuildExpression(VFXExpression[] inputExpressi
             var start = inputExpression[2];
             var end = inputExpression[3];
 
-            return new[] { VFXOperatorUtility.SequentialLine(start, end, index, count, mode) };
+            return new[] { VFXOperatorUtility.SequentialLine(start, end, index, count) };
         }
 
         public override void Sanitize(int version)
diff --git a/package/Editor/Models/Operators/VFXOperatorUtility.cs b/package/Editor/Models/Operators/VFXOperatorUtility.cs
index 610d633a8..98a3c8c24 100755
--- a/package/Editor/Models/Operators/VFXOperatorUtility.cs
+++ b/package/Editor/Models/Operators/VFXOperatorUtility.cs
@@ -69,25 +69,26 @@ static public VFXExpression Clamp(VFXExpression input, VFXExpression min, VFXExp
         static public VFXExpression Saturate(VFXExpression input)
         {
             //Max(Min(x, 1.0f), 0.0f))
-            return new VFXExpressionSaturate(input);
+            return Clamp(input, ZeroExpression[input.valueType], OneExpression[input.valueType]);
         }
 
         static public VFXExpression Frac(VFXExpression input)
         {
             //x - floor(x)
-            return new VFXExpressionFrac(input);
+            return input - new VFXExpressionFloor(input);
         }
 
         static public VFXExpression Ceil(VFXExpression input)
         {
             // ceil(x) = -floor(-x)
-            return new VFXExpressionCeil(input);
+            return Negate(new VFXExpressionFloor(Negate(input)));
         }
 
         static public VFXExpression Round(VFXExpression input)
         {
             //x = floor(x + 0.5)
-            return new VFXExpressionRound(input);
+            var half = HalfExpression[input.valueType];
+            return new VFXExpressionFloor(input + half);
         }
 
         static public VFXExpression Log(VFXExpression input, VFXExpression _base)
@@ -513,42 +514,12 @@ static public VFXExpression FixedRandom(uint hash, bool perElement)
         static public VFXExpression FixedRandom(VFXExpression hash, bool perElement)
         {
             VFXExpression seed = new VFXExpressionBitwiseXor(hash, VFXBuiltInExpression.SystemSeed);
-            if (perElement)
-                seed = new VFXExpressionBitwiseXor(new VFXAttributeExpression(VFXAttribute.ParticleId), seed);
-            return new VFXExpressionFixedRandom(seed);
-        }
-
-        public enum SequentialAddressingMode
-        {
-            Wrap,
-            Clamp,
-            Mirror
-        };
-
-        static private VFXExpression ApplyAddressingMode(VFXExpression index, VFXExpression count, SequentialAddressingMode mode)
-        {
-            VFXExpression r = null;
-            if (mode == SequentialAddressingMode.Wrap)
-            {
-                r = VFXOperatorUtility.Modulo(index, count);
-            }
-            else if (mode == SequentialAddressingMode.Clamp)
-            {
-                r = VFXOperatorUtility.Clamp(index, ZeroExpression[VFXValueType.Uint32], count, false);
-            }
-            else if (mode == SequentialAddressingMode.Mirror)
-            {
-                var direction = VFXOperatorUtility.Modulo(index / count, VFXOperatorUtility.TwoExpression[VFXValueType.Uint32]);
-                var modulo = VFXOperatorUtility.Modulo(index, count);
-                r = VFXOperatorUtility.Lerp(modulo, count - modulo, direction);
-            }
-            return r;
+            return new VFXExpressionFixedRandom(seed, perElement);
         }
 
-        static public VFXExpression SequentialLine(VFXExpression start, VFXExpression end, VFXExpression index, VFXExpression count, SequentialAddressingMode mode)
+        static public VFXExpression SequentialLine(VFXExpression start, VFXExpression end, VFXExpression index, VFXExpression count)
         {
-            VFXExpression dt = ApplyAddressingMode(index, count, mode);
-            dt = new VFXExpressionCastUintToFloat(dt);
+            VFXExpression dt = new VFXExpressionCastUintToFloat(VFXOperatorUtility.Modulo(index, count));
             var size = new VFXExpressionCastUintToFloat(count) - VFXOperatorUtility.OneExpression[VFXValueType.Float];
             size = new VFXExpressionMax(size, VFXOperatorUtility.OneExpression[VFXValueType.Float]);
             dt = dt / size ;
@@ -556,10 +527,9 @@ static public VFXExpression SequentialLine(VFXExpression start, VFXExpression en
             return VFXOperatorUtility.Lerp(start, end, dt);
         }
 
-        static public VFXExpression SequentialCircle(VFXExpression center, VFXExpression radius, VFXExpression normal, VFXExpression up, VFXExpression index, VFXExpression count, SequentialAddressingMode mode)
+        static public VFXExpression SequentialCircle(VFXExpression center, VFXExpression radius, VFXExpression normal, VFXExpression up, VFXExpression index, VFXExpression count)
         {
-            VFXExpression dt = ApplyAddressingMode(index, count, mode);
-            dt = new VFXExpressionCastUintToFloat(dt);
+            VFXExpression dt = new VFXExpressionCastUintToFloat(VFXOperatorUtility.Modulo(index, count));
             dt = dt / new VFXExpressionCastUintToFloat(count);
 
             var cos = new VFXExpressionCos(dt * VFXOperatorUtility.TauExpression[VFXValueType.Float]) as VFXExpression;
@@ -573,9 +543,9 @@ static public VFXExpression SequentialCircle(VFXExpression center, VFXExpression
             return center + (cos * up + sin * left) * radius;
         }
 
-        static public VFXExpression Sequential3D(VFXExpression origin, VFXExpression axisX, VFXExpression axisY, VFXExpression axisZ, VFXExpression index, VFXExpression countX, VFXExpression countY, VFXExpression countZ, SequentialAddressingMode mode)
+        static public VFXExpression Sequential3D(VFXExpression origin, VFXExpression axisX, VFXExpression axisY, VFXExpression axisZ, VFXExpression index, VFXExpression countX, VFXExpression countY, VFXExpression countZ)
         {
-            index = ApplyAddressingMode(index, countX * countY * countZ, mode);
+            index = VFXOperatorUtility.Modulo(index, countX * countY * countZ);
             var z = new VFXExpressionCastUintToFloat(VFXOperatorUtility.Modulo(index, countZ));
             var y = new VFXExpressionCastUintToFloat(VFXOperatorUtility.Modulo(index / countZ, countY));
             var x = new VFXExpressionCastUintToFloat(index / (countY * countZ));
@@ -609,5 +579,21 @@ static public VFXExpression GetPerspectiveMatrix(VFXExpression fov, VFXExpressio
 
             return new VFXExpressionVector4sToMatrix(m0, m1, m2, m3);
         }
+
+        // TODO Use a dedicated expression for that
+        static public VFXExpression Transpose(VFXExpression matrix)
+        {
+            var m0 = new VFXExpressionMatrixToVector4s(matrix, VFXValue.Constant(0));
+            var m1 = new VFXExpressionMatrixToVector4s(matrix, VFXValue.Constant(1));
+            var m2 = new VFXExpressionMatrixToVector4s(matrix, VFXValue.Constant(2));
+            var m3 = new VFXExpressionMatrixToVector4s(matrix, VFXValue.Constant(3));
+
+            var n0 = new VFXExpressionCombine(m0.x, m1.x, m2.x, m3.x);
+            var n1 = new VFXExpressionCombine(m0.y, m1.y, m2.y, m3.y);
+            var n2 = new VFXExpressionCombine(m0.z, m1.z, m2.z, m3.z);
+            var n3 = new VFXExpressionCombine(m0.w, m1.w, m2.w, m3.w);
+
+            return new VFXExpressionVector4sToMatrix(n0, n1, n2, n3);
+        }
     }
 }
diff --git a/package/Editor/Models/Slots/VFXSlot.cs b/package/Editor/Models/Slots/VFXSlot.cs
index c7e1a1573..99f645101 100755
--- a/package/Editor/Models/Slots/VFXSlot.cs
+++ b/package/Editor/Models/Slots/VFXSlot.cs
@@ -113,7 +113,11 @@ public bool spaceable
             get
             {
                 var masterSlot = GetMasterSlot();
-                return VFXLibrary.IsSpaceableSlotType(masterSlot.property.type);
+                if (masterSlot.m_SlotsSpaceable == null)
+                {
+                    InitSpaceable(masterSlot);
+                }
+                return masterSlot.m_SlotsSpaceable.Any();
             }
         }
 
@@ -167,12 +171,6 @@ public SpaceableType GetSpaceTransformationType()
                 Debug.LogError("Unexpected call of GetSpaceTransformationType : " + ToString());
 
             var masterSlot = GetMasterSlot();
-            if (masterSlot.m_SlotsSpaceable == null)
-            {
-                //Should only happened after a domain reload : OnEnable is called but not Sanitize (only if VFXType doesn't change)
-                masterSlot.InitializeSpaceableCachedSlot();
-            }
-
             var findSlot = masterSlot.m_SlotsSpaceable.Where(o => o.slot == this).FirstOrDefault();
             return findSlot.slot == null ? SpaceableType.None : findSlot.type; //Explicitly return none (not really needed because is default of spaceableType)
         }
@@ -346,30 +344,6 @@ public static VFXSlot Create(VFXPropertyWithValue property, Direction direction)
             return Create(property.property, direction, property.value);
         }
 
-        private void InitializeSpaceableCachedSlot()
-        {
-            if (!IsMasterSlot())
-                throw new InvalidOperationException();
-
-            m_SlotsSpaceable = ComputeCacheSpaceable(this);
-            if (m_SlotsSpaceable.Any())
-            {
-                if (!spaceable)
-                    Debug.LogError("Unexpected slot spaceable while slot isn't mark as spaceable : " + property.type);
-
-                if (m_MasterData.m_Space == (VFXCoordinateSpace)int.MaxValue)
-                {
-                    m_MasterData.m_Space = VFXCoordinateSpace.Local;
-                }
-            }
-            else
-            {
-                if (spaceable)
-                    Debug.LogError("Expected slot spaceable while slot is  mark as spaceable : " + property.type);
-                m_MasterData.m_Space = (VFXCoordinateSpace)int.MaxValue;
-            }
-        }
-
         // Create and return a slot hierarchy from a property info
         public static VFXSlot Create(VFXProperty property, Direction direction, object value = null)
         {
@@ -388,7 +362,7 @@ public static VFXSlot Create(VFXProperty property, Direction direction, object v
 
             slot.m_MasterData = masterData;
             slot.UpdateDefaultExpressionValue();
-            slot.InitializeSpaceableCachedSlot();
+            InitSpaceable(slot);
             return slot;
         }
 
@@ -502,9 +476,6 @@ public override void OnUnknownChange()
             m_ExpressionTreeUpToDate = false;
             m_DefaultExpressionInitialized = false;
             m_SlotsSpaceable = null;
-
-            if (IsMasterSlot())
-                InitializeSpaceableCachedSlot();
         }
 
         public override void OnEnable()
@@ -527,22 +498,6 @@ public override void OnEnable()
         }
 
         public override void Sanitize(int version)
-        {
-            if (!IsMasterSlot())
-                return; //Give only the responsibility to the master slot to sanitize children (sanitizing deeper children first)
-
-            //PropagateToChildrenReverse(c => c.InternalSanitize(version), false); //Not possible because collection could be modified while sanitizing
-            var slotToSanitize = new List<VFXSlot>();
-            PropagateToChildrenReverse(c => slotToSanitize.Add(c), false);
-            foreach (var slot in slotToSanitize)
-                slot.InternalSanitize(version);
-
-            var masterSlot = this;
-            masterSlot = masterSlot.InternalSanitize(version);
-            masterSlot.InitializeSpaceableCachedSlot();
-        }
-
-        private VFXSlot InternalSanitize(int version)
         {
             // Remove invalid links (without owners)
             if (owner == null)
@@ -604,11 +559,8 @@ private VFXSlot InternalSanitize(int version)
                 }
 
                 CopyLinks(newSlot, this, true);
-                CopySpace(newSlot, this, true);
                 UnlinkAll(true);
-                return newSlot;
             }
-            return this;
         }
 
         private void SetDefaultExpressionValue()
@@ -636,12 +588,12 @@ private void InitDefaultExpression()
             m_DefaultExpressionInitialized = true;
         }
 
-        private static SlotWithSpaceTransformation[] ComputeCacheSpaceable(VFXSlot masterSlot)
+        private static void InitSpaceable(VFXSlot masterSlot)
         {
             if (!masterSlot.IsMasterSlot())
                 throw new InvalidOperationException("Trying to call init spaceable on a child slot");
 
-            var spaceableCollection = new List<SlotWithSpaceTransformation>();
+            var spaceableCollection = new List<SpaceSlotConcerned>();
             masterSlot.PropagateToChildren(s =>
             {
                 if (!s.property.IsExpandable())
@@ -650,7 +602,7 @@ private static SlotWithSpaceTransformation[] ComputeCacheSpaceable(VFXSlot maste
                 var spaceAttributeOnType = s.property.type.GetCustomAttributes(typeof(VFXSpaceAttribute), true).FirstOrDefault();
                 if (spaceAttributeOnType != null)
                 {
-                    spaceableCollection.Add(new SlotWithSpaceTransformation
+                    spaceableCollection.Add(new SpaceSlotConcerned
                     {
                         slot = s,
                         type = (spaceAttributeOnType as VFXSpaceAttribute).type
@@ -659,9 +611,7 @@ private static SlotWithSpaceTransformation[] ComputeCacheSpaceable(VFXSlot maste
 
                 var fields = s.property.type.GetFields(BindingFlags.Public | BindingFlags.Instance).ToArray();
                 if (fields.Length != s.children.Count())
-                    throw new InvalidOperationException(string.Format("Unexpected slot count for : " + s.property.type + " ({0} vs. {1})",
-                                                                       fields.Length == 0 ? "(empty)" : fields.Select(o => o.Name).Aggregate((a, b) => a + ", " + b),
-                                                                       s.children.Count() == 0 ? "(empty)" : s.children.Select(o => o.name).Aggregate((a, b) => a + ", " + b)));
+                    throw new InvalidOperationException("Unexpected slot count for : " + s.property.type.ToString());
 
                 for (int fieldIndex = 0; fieldIndex < fields.Length; ++fieldIndex)
                 {
@@ -674,7 +624,7 @@ private static SlotWithSpaceTransformation[] ComputeCacheSpaceable(VFXSlot maste
                             slot = slot.GetParent();
                         }
 
-                        spaceableCollection.Add(new SlotWithSpaceTransformation
+                        spaceableCollection.Add(new SpaceSlotConcerned
                         {
                             slot = slot,
                             type = (spaceAttribute as VFXSpaceAttribute).type
@@ -687,7 +637,30 @@ private static SlotWithSpaceTransformation[] ComputeCacheSpaceable(VFXSlot maste
             {
                 Debug.LogErrorFormat("Unexpected space collection computed for {0}", masterSlot.property.type);
             }
-            return spaceableCollection.ToArray();
+
+            masterSlot.m_SlotsSpaceable = spaceableCollection.ToArray();
+            if (masterSlot.m_SlotsSpaceable.Any())
+            {
+                if (masterSlot.m_MasterData.m_Space == (VFXCoordinateSpace)int.MaxValue)
+                {
+                    // By default set the same space as the data
+                    // TODO This is useless at the moment because the InitSpaceable is called fat too soon before the slot is even attached to a container...
+                    VFXData data = null;
+                    if (masterSlot.owner is VFXBlock)
+                        data = ((VFXBlock)(masterSlot.owner)).GetData();
+                    else if (masterSlot.owner is VFXContext)
+                        data = ((VFXContext)(masterSlot.owner)).GetData();
+
+                    if (data is ISpaceable)
+                        masterSlot.m_MasterData.m_Space = ((ISpaceable)data).space;
+                    else
+                        masterSlot.m_MasterData.m_Space = VFXCoordinateSpace.Local;
+                }
+            }
+            else
+            {
+                masterSlot.m_MasterData.m_Space = (VFXCoordinateSpace)int.MaxValue;
+            }
         }
 
         public void UpdateDefaultExpressionValue()
@@ -832,22 +805,11 @@ protected void PropagateToParent(Action<VFXSlot> func)
             }
         }
 
-        protected void PropagateToChildren(Action<VFXSlot> func, bool includeThis = true)
-        {
-            if (includeThis)
-                func(this);
-
-            foreach (var child in children)
-                child.PropagateToChildren(func, true);
-        }
-
-        protected void PropagateToChildrenReverse(Action<VFXSlot> func, bool includeThis = true)
+        protected void PropagateToChildren(Action<VFXSlot> func)
         {
+            func(this);
             foreach (var child in children)
-                child.PropagateToChildrenReverse(func, true);
-
-            if (includeThis)
-                func(this);
+                child.PropagateToChildren(func);
         }
 
         protected void PropagateToTree(Action<VFXSlot> func)
@@ -1150,9 +1112,9 @@ public virtual VFXValue DefaultExpression(VFXValue.Mode mode)
         [NonSerialized]
         private bool m_DefaultExpressionInitialized = false;
         [NonSerialized]
-        private SlotWithSpaceTransformation[] m_SlotsSpaceable;
+        private SpaceSlotConcerned[] m_SlotsSpaceable;
 
-        private struct SlotWithSpaceTransformation
+        private struct SpaceSlotConcerned
         {
             public VFXSlot slot;
             public SpaceableType type;
diff --git a/package/Editor/Models/VFXGraph.cs b/package/Editor/Models/VFXGraph.cs
index 4373083f1..659077fd0 100755
--- a/package/Editor/Models/VFXGraph.cs
+++ b/package/Editor/Models/VFXGraph.cs
@@ -129,12 +129,6 @@ class VFXGraph : VFXModel
         // size refactor
         public static readonly int CurrentVersion = 1;
 
-        public override void OnEnable()
-        {
-            base.OnEnable();
-            m_ExpressionGraphDirty = true;
-        }
-
         public VisualEffectResource visualEffectResource
         {
             get
diff --git a/package/Editor/Models/VFXModel.cs b/package/Editor/Models/VFXModel.cs
index 652cc1afc..a9d3a7e53 100755
--- a/package/Editor/Models/VFXModel.cs
+++ b/package/Editor/Models/VFXModel.cs
@@ -31,6 +31,7 @@ public enum InvalidationCause
         {
             kStructureChanged,      // Model structure (hierarchy) has changed
             kParamChanged,          // Some parameter values have changed
+            kParamPropagated,       // Some parameter values have change and was propagated from the parents
             kSettingChanged,        // A setting value has changed
             kSpaceChanged,          // Space has been changed
             kConnectionChanged,     // Connection have changed
diff --git a/package/Editor/PackageInfo.cs b/package/Editor/PackageInfo.cs
index 43a397e04..9d116751a 100755
--- a/package/Editor/PackageInfo.cs
+++ b/package/Editor/PackageInfo.cs
@@ -17,7 +17,7 @@ public static string fileSystemPackagePath
             {
                 if (m_PackagePath == null)
                 {
-                    foreach (var pkg in UnityEditor.PackageManager.Packages.GetAll())
+                    foreach (var pkg in UnityEditor.PackageManager.PackageInfo.GetAll())
                     {
                         if (pkg.name == "com.unity.visualeffectgraph")
                         {
diff --git a/package/Editor/Resources/PropertyRM.uss b/package/Editor/Resources/PropertyRM.uss
index aec76fd58..6b8187db2 100755
--- a/package/Editor/Resources/PropertyRM.uss
+++ b/package/Editor/Resources/PropertyRM.uss
@@ -6,8 +6,8 @@
 
 .propertyrm #icon
 {
-    width:13;
-    height:13;
+    width: 13px;
+    height: 13px;
 }
 
 .propertyrm.icon-expandable #icon
@@ -39,16 +39,15 @@
 
 .propertyrm #spacebutton
 {
-    -flex:1;
-    width:16;
-    height:16;
-    margin-left:4;
-    margin-right:8;
+    width: 16px;
+    height: 16px;
+    margin-left: 4px;
+    margin-right: 8px;
 }
 .propertyrm .unity-button
 {
-    margin-top:1;
-    margin-bottom:1;
+    margin-top: 1px;
+    margin-bottom: 1px;
     padding-top:0;
     padding-bottom:0;
 }
@@ -56,9 +55,9 @@
 .propertyrm #label
 {
     color: rgb(153,153,153);
-    height:16;
+    height: 16px;
     margin-left:0;
-    padding-left:1;
+    padding-left: 1px;
     margin-bottom:0;
     padding-bottom:0;
     -unity-text-align:middle-left;
@@ -66,16 +65,16 @@
 
 .propertyrm > VFXLabeledField.fieldContainer,.propertyrm > VFXEnumField.fieldContainer
 {
-    padding-top:1;
-    padding-bottom:1;
-    height:18;
+    padding-top: 1px;
+    padding-bottom: 1px;
+    height: 18px;
 }
 
 
 .propertyrm VFXMatrix4x4Field.fieldContainer
 {
     flex:1 0 auto;
-    height:-1;
+    height: -1px;
 }
 
 .spaceCamera
@@ -111,8 +110,8 @@
     flex:0 0 auto;
     -unity-text-align:middle-center;
     margin-left:0;
-    padding-left:4;
-    margin-right:2;
+    padding-left: 4px;
+    margin-right: 2px;
     padding-right:0;
 }
 
@@ -123,7 +122,6 @@
 
 .propertyrm .fieldContainer, .propertyrm .unity-float-field
 {
-    -align-items: center;
     flex-direction:row;
     flex:1 1 0;
 
@@ -131,7 +129,7 @@
     margin-right:0;
     margin-top:0;
     margin-bottom:0;
-    height:16;
+    height: 16px;
 }
 
 BoolPropertyRM > .unity-toggle
@@ -161,19 +159,19 @@ BoolPropertyRM > .unity-toggle
 ColorPropertyRM
 {
     flex-direction:row;
-    height:36;
+    height: 36px;
 }
 
 ColorPropertyRM .colorcontainer, Vector3PropertyRM .colorcontainer
 {
     flex:1 0 auto;
-    border-left-width:1;
-    border-right-width:1;
-    border-top-width:1;
-    border-bottom-width:1;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
     border-color:#000;
-    margin-top:2;
-    margin-bottom:2;
+    margin-top: 2px;
+    margin-bottom: 2px;
 }
 
 ColorPropertyRM > .maincontainer > .fieldContainer
@@ -220,7 +218,7 @@ CurvePropertyRM .unity-curve-field
 CurvePropertyRM
 {
     flex:1 0 auto;
-    min-width:100;
+    min-width: 100px;
 }
 
 StringPropertyRM VFXStringField .unity-text-field
@@ -233,7 +231,7 @@ StringPropertyRM VFXStringField .unity-text-field
 
 Matrix4x4PropertyRM.propertyrm > .fieldContainer
 {
-    height:-1;
+    height: -1px;
 }
 
 
@@ -248,7 +246,7 @@ Matrix4x4PropertyRM.propertyrm > .fieldContainer
     margin-bottom:0;
     margin-left:0;
     margin-right:0;
-    padding-left: 16;
+    padding-left: 16px;
     -unity-text-align: middle-left;
 }
 
diff --git a/package/Editor/Resources/Resizable.uss b/package/Editor/Resources/Resizable.uss
index 1d1806dda..398b25fd4 100755
--- a/package/Editor/Resources/Resizable.uss
+++ b/package/Editor/Resources/Resizable.uss
@@ -11,14 +11,14 @@ ResizableElement
 
 ResizableElement #right
 {
-    width:8;
+    width: 8px;
     flex-direction: column;
     align-items: stretch;
 }
 
 ResizableElement #left
 {
-    width:8;
+    width: 8px;
     flex-direction: column;
     align-items: stretch;
 }
@@ -32,7 +32,7 @@ ResizableElement #middle
 
 ResizableElement #left #top-left-resize
 {
-    height:8;
+    height: 8px;
     cursor: resize-up-left;
 }
 
@@ -44,13 +44,13 @@ ResizableElement #left #left-resize
 
 ResizableElement #left #bottom-left-resize
 {
-    height:8;
+    height: 8px;
     cursor: resize-up-right;
 }
 
 ResizableElement #middle #top-resize
 {
-    height:8;
+    height: 8px;
     cursor: resize-vertical;
 }
 
@@ -61,13 +61,13 @@ ResizableElement #middle #middle-center
 
 ResizableElement #middle #bottom-resize
 {
-    height:8;
+    height: 8px;
     cursor: resize-vertical;
 }
 
 ResizableElement #right #top-right-resize
 {
-    height:8;
+    height: 8px;
     cursor: resize-up-right;
 }
 
@@ -79,6 +79,6 @@ ResizableElement #right #right-resize
 
 ResizableElement #right #bottom-right-resize
 {
-    height:8;
+    height: 8px;
     cursor: resize-up-left;
 }
diff --git a/package/Editor/Resources/Selectable.uss b/package/Editor/Resources/Selectable.uss
index 00438875a..c365eb24f 100755
--- a/package/Editor/Resources/Selectable.uss
+++ b/package/Editor/Resources/Selectable.uss
@@ -9,25 +9,25 @@
 
 .selectable:hover  > #selection-border{
     border-color: rgba(68,192,255, 0.5);
-    border-top-width:1;
-    border-left-width:1;
-    border-right-width:1;
-    border-bottom-width:1;
+    border-top-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
 }
 
 .selectable:selected  > #selection-border
 {
     border-color: #44C0FF;
-    border-left-width:1;
-    border-right-width:1;
-    border-top-width:1;
-    border-bottom-width:1;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
 }
 
 .selectable:selected:hover  > #selection-border
 {
-    border-left-width:2;
-    border-right-width:2;
-    border-top-width:2;
-    border-bottom-width:2;
+    border-left-width: 2px;
+    border-right-width: 2px;
+    border-top-width: 2px;
+    border-bottom-width: 2px;
 }
diff --git a/package/Editor/Resources/StickyNote.uss b/package/Editor/Resources/StickyNote.uss
index 7370026b7..a04e9ac21 100755
--- a/package/Editor/Resources/StickyNote.uss
+++ b/package/Editor/Resources/StickyNote.uss
@@ -5,8 +5,8 @@
 
 .sticky-note
 {
-    min-height:100;
-    min-width:80;
+    min-height: 100px;
+    min-width: 80px;
     position:absolute;
     flex-direction:column;
     align-items:stretch;
@@ -24,12 +24,12 @@
     padding-right:0;
     padding-top:0;
     padding-bottom:0;
-    border-radius:2;
+    border-radius: 2px;
 }
 
 .sticky-note #selection-border
 {
-    border-radius:2;
+    border-radius: 2px;
 }
 
 .sticky-note, * .unity-text-field
@@ -39,8 +39,8 @@
 
 .sticky-note .resizer
 {
-    margin-bottom:6;
-    margin-right:6;
+    margin-bottom: 6px;
+    margin-right: 6px;
 }
 
 .sticky-note *
@@ -59,7 +59,7 @@
 .theme-black > #node-border
 {
     border-color:#AB924B;
-    border-radius:8;
+    border-radius: 8px;
 }
 .sticky-note.theme-black, .theme-black .unity-text-field
 {
@@ -72,21 +72,16 @@
     flex:1 0 auto;
     flex-direction:column;
     align-items:stretch;
-    border-left-width:2;
-    border-top-width:2;
-    border-bottom-width:2;
-    border-right-width:2;
-}
-
-#title-field
-{
-    positionType:absolute;
+    border-left-width: 2px;
+    border-top-width: 2px;
+    border-bottom-width: 2px;
+    border-right-width: 2px;
 }
 
 
 * #title, * #title-field
 {
-    font-size:20;
+    font-size: 20px;
     white-space: normal;
 }
 
@@ -100,7 +95,7 @@
 
 * #contents, * #contents *
 {
-    font-size:11;
+    font-size: 11px;
     white-space: normal;
 }
 
@@ -115,7 +110,7 @@
 
 * #title.empty
 {
-    height:12;
+    height: 12px;
 }
 
 * #contents
@@ -147,45 +142,44 @@
 
 * .unity-label
 {
-    border-top-width:1;
-    border-left-width:1;
-    border-right-width:1;
-    border-bottom-width:1;
-    margin-left:6;
-    margin-right:6;
-    margin-top:1;
-    margin-bottom:1;
+    border-top-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    margin-left: 6px;
+    margin-right: 6px;
+    margin-top: 1px;
+    margin-bottom: 1px;
     padding-left:0;
     padding-right:0;
-    -border-color: rgba(0, 0, 0, 0.5);
 }
 
 .size-medium #title, .size-medium #title-field
 {
-    font-size:40;
+    font-size: 40px;
 }
 .size-medium #contents, .size-medium #contents *
 {
-    font-size:24;
+    font-size: 24px;
 }
 
 .size-large #title, .size-large #title-field
 {
-    font-size:60;
+    font-size: 60px;
 }
 .size-large #contents, .size-large #contents *
 {
-    font-size:36;
+    font-size: 36px;
 }
 
 .size-huge #title, .size-huge #title-field
 {
-    font-size:80;
+    font-size: 80px;
 }
 
 .size-huge #contents, .size-huge #contents *
 {
-    font-size:56;
+    font-size: 56px;
 }
 
 * .unity-label:hover
diff --git a/package/Editor/Resources/VFXBlackboard.uss b/package/Editor/Resources/VFXBlackboard.uss
index 4c43aa627..e1e879237 100755
--- a/package/Editor/Resources/VFXBlackboard.uss
+++ b/package/Editor/Resources/VFXBlackboard.uss
@@ -1,11 +1,11 @@
 .blackboard *
 {
-    font-size:11;
+    font-size: 11px;
 }
 
 #vfx-properties
 {
-    margin-bottom:7;
+    margin-bottom: 7px;
 }
 
  #vfx-properties .propertyrm
@@ -18,20 +18,20 @@ VFXBlackboardRow.hovered #pill #selection-border
 {
     background-color:rgba(68,192,255,0.4);
     border-color: #44C0FF;
-    border-left-width:2;
-    border-top-width:2;
-    border-right-width:2;
-    border-bottom-width:2;
-    left:1;
-    right:1;
-    top:1;
-    bottom:1;
+    border-left-width: 2px;
+    border-top-width: 2px;
+    border-right-width: 2px;
+    border-bottom-width: 2px;
+    left: 1px;
+    right: 1px;
+    top: 1px;
+    bottom: 1px;
 }
 
 
 .blackboard > #dragIndicator {
     background-color: #44C0FF;
-    min-height: 4;
+    min-height: 4px;
     left:0;
     right:0;
 }
@@ -65,8 +65,8 @@ VFXBlackboardCategory #name-field
 
 #expandButton > #buttonImage {
     --unity-image : resource("GraphView/Nodes/NodeChevronRight.png");
-    width: 12;
-    height: 12;
+    width: 12px;
+    height: 12px;
 }
 
 VFXBlackboardCategory.expanded #expandButton > #buttonImage {
@@ -80,20 +80,20 @@ VFXBlackboardCategory > .mainContainer > #rowsContainer
 
 VFXBlackboardCategory.expanded  > .mainContainer > #rowsContainer
 {
-    height:-1;
+    height: -1px;
 }
 
 VFXBlackboardCategory > .mainContainer > #sectionHeader
 {
-    padding-left:4;
+    padding-left: 4px;
 }VFXBlackboardCategory > .mainContainer > #rowsContainer
 {
-    padding-left:8;
+    padding-left: 8px;
 }
 
 #expandButton:hover > #buttonImage {
     background-color: #212121;
-    border-radius: 1;
+    border-radius: 1px;
 }
 
 #divider {
@@ -102,6 +102,6 @@ VFXBlackboardCategory > .mainContainer > #sectionHeader
 }
 
 #divider.horizontal {
-    height:0.01;
-    border-bottom-width: 1;
+    height: 0.01px;
+    border-bottom-width: 1px;
 }
diff --git a/package/Editor/Resources/VFXBlock.uss b/package/Editor/Resources/VFXBlock.uss
index 05c5b18ae..81d89fe52 100755
--- a/package/Editor/Resources/VFXBlock.uss
+++ b/package/Editor/Resources/VFXBlock.uss
@@ -3,10 +3,10 @@ VFXBlockUI.VFXNodeUI.node {
     align-items:stretch;
     border-radius:0;
     border-color:rgba(0,0,0,0);
-    padding-top:2;
+    padding-top: 2px;
     padding-left:0;
     padding-right:0;
-    padding-bottom:1;
+    padding-bottom: 1px;
     margin-left:0;
     margin-right:0;
 }
@@ -18,13 +18,13 @@ VFXBlockUI.VFXNodeUI.node.first
 VFXBlockUI.VFXNodeUI.node > #selection-border{
     margin-left:0;
     margin-right:0;
-    margin-top:2;
-    margin-bottom:1;
+    margin-top: 2px;
+    margin-bottom: 1px;
 }
 
 VFXBlockUI.VFXNodeUI.node #contents > #top > #input
 {
-    padding-bottom:8;
+    padding-bottom: 8px;
     flex: 1 1 auto;
 }
 
@@ -43,7 +43,7 @@ VFXContextUI VFXBlockUI.node #node-border #title.disabled
 
 VFXContextUI VFXBlockUI.node #node-border #title #title-label
 {
-    margin-left:4;
+    margin-left: 4px;
     flex:1 0 auto;
 }
 
@@ -52,14 +52,10 @@ VFXContextUI VFXBlockUI.node #node-border #title.disabled #title-label
     opacity:0.5;
 }
 
-VFXBlockUI.node #title .unity-toggle
-{
-    -margin-right:0;
-}
 VFXBlockUI.node #title #collapse-button
 {
-    width:20;
-    padding-right:4;
+    width: 20px;
+    padding-right: 4px;
 }
 VFXBlockUI.node
 {
diff --git a/package/Editor/Resources/VFXComponentBoard.uss b/package/Editor/Resources/VFXComponentBoard.uss
index df097e6d9..1f6857066 100755
--- a/package/Editor/Resources/VFXComponentBoard.uss
+++ b/package/Editor/Resources/VFXComponentBoard.uss
@@ -10,13 +10,13 @@ VFXComponentBoard.graphElement
     padding-top:0;
     padding-bottom:0;
 
-    min-width:140;
-    min-height:100;
+    min-width: 140px;
+    min-height: 100px;
 }
 
  *
 {
-    font-size:11;
+    font-size: 11px;
 }
 
 #divider {
@@ -25,8 +25,8 @@ VFXComponentBoard.graphElement
 }
 
 #divider.horizontal {
-    height:0.01;
-    border-bottom-width: 1;
+    height: 0.01px;
+    border-bottom-width: 1px;
 }
 
 
@@ -43,20 +43,20 @@ VFXComponentBoard, #component-container
     flex-direction:column;
     align-items:stretch;
     overflow:hidden;
-    padding-top:8;
+    padding-top: 8px;
 }
 
 #header {
     flex-direction: row;
     align-items: stretch;
     background-color: #393939;
-    border-bottom-width: 1;
+    border-bottom-width: 1px;
     border-color: #212121;
-    border-top-right-radius: 4;
-    border-top-left-radius: 4;
-    padding-left: 1;
-    padding-top: 4;
-    padding-bottom: 2;
+    border-top-right-radius: 4px;
+    border-top-left-radius: 4px;
+    padding-left: 1px;
+    padding-top: 4px;
+    padding-bottom: 2px;
 }
 #header > #labelContainer {
     flex:1 0 auto;
@@ -64,11 +64,11 @@ VFXComponentBoard, #component-container
     align-items: stretch;
 }
 #header > #labelContainer > #titleLabel {
-    font-size : 14;
+    font-size : 14px;
     color: #c1c1c1;
 }
 #header > #labelContainer > #subTitleLabel {
-    font-size: 11;
+    font-size: 11px;
     color: #606060;
     white-space: normal;
 }
@@ -76,13 +76,13 @@ VFXComponentBoard, #component-container
 
 VFXComponentBoardEventUI .unity-button, #on-play-button, #on-stop-button,#attach, #select,#component-path
 {
-    height:20;
+    height: 20px;
 }
 
 
 #attach, #select
 {
-    width:60;
+    width: 60px;
 }
 
 #component-path
@@ -97,8 +97,8 @@ VFXComponentBoardEventUI .unity-button, #on-play-button, #on-stop-button,#attach
 
 #attach-container
 {
-    padding-top: 8;
-    padding-bottom: 8;
+    padding-top: 8px;
+    padding-bottom: 8px;
 }
 #particle-count-container > #particle-count
 {
@@ -113,7 +113,7 @@ VFXComponentBoardEventUI .unity-button, #on-play-button, #on-stop-button,#attach
 #toolbar .unity-button
 {
     flex:1 0 auto;
-    height:24;
+    height: 24px;
     align-items:center;
 }
 
@@ -141,14 +141,14 @@ VFXComponentBoardEventUI .unity-button, #on-play-button, #on-stop-button,#attach
 #play-rate-container
 {
     flex-direction:row;
-    height:28;
+    height: 28px;
     align-items: center;
-    padding-bottom:8;
+    padding-bottom: 8px;
 }
 
 #events-label
 {
-    padding-top:8;
+    padding-top: 8px;
 }
 
 #play-rate-container #play-rate-slider
@@ -158,7 +158,7 @@ VFXComponentBoardEventUI .unity-button, #on-play-button, #on-stop-button,#attach
 
 #play-rate-container #play-rate-field
 {
-    width:80;
+    width: 80px;
 }
 
 #play-rate-container #play-rate-menu
@@ -166,8 +166,8 @@ VFXComponentBoardEventUI .unity-button, #on-play-button, #on-stop-button,#attach
     padding-left:0;
     border-left-width:0;
     border-top-width:0;
-    width:40;
-    height:16;
+    width: 40px;
+    height: 16px;
 }
 
 VFXComponentBoardEventUI
diff --git a/package/Editor/Resources/VFXContext.uss b/package/Editor/Resources/VFXContext.uss
index 3c3b3d536..34a164e46 100755
--- a/package/Editor/Resources/VFXContext.uss
+++ b/package/Editor/Resources/VFXContext.uss
@@ -1,5 +1,5 @@
 VFXContextUI.graphElement {
-    font-size:18;
+    font-size: 18px;
     flex-direction: column;
     margin-top:0;
     padding-left:0;
@@ -10,20 +10,19 @@ VFXContextUI.graphElement {
 }
 VFXContextUI > #node-border
 {
-    width:368;
+    width: 368px;
     background-color:rgba(29,29,29,0.8);
-    border-radius:8;
-    border-left-width:1;
-    border-right-width:1;
-    border-top-width:1;
-    border-bottom-width:1;
-    padding-top : 5;
-    padding-bottom : 5;
-    margin-top : 19;
-    margin-bottom : 19;
-    marging-top:2;
-    margin-left:3;
-    margin-right:3;
+    border-radius: 8px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    padding-top : 5px;
+    padding-bottom : 5px;
+    margin-top : 19px;
+    margin-bottom : 19px;
+    margin-left: 3px;
+    margin-right: 3px;
 }
 
 VFXContextUI > #node-border.empty > #inside > #contents
@@ -95,19 +94,19 @@ VFXContextUI.typenone  > #node-border
 
 VFXContextUI > #selection-border
 {
-    border-radius:10;
-    margin-top:18;
-    margin-bottom:18;
+    border-radius: 10px;
+    margin-top: 18px;
+    margin-bottom: 18px;
 }
 VFXContextUI #inside
 {
-    margin-left: 8;
-    margin-right:8;
+    margin-left: 8px;
+    margin-right: 8px;
 }
 
 VFXContextUI .extremity
 {
-    border-radius:2;
+    border-radius: 2px;
     justify-content:center;
     align-items:center;
     flex-direction:row;
@@ -123,7 +122,7 @@ VFXContextUI #HeaderContainer
 VFXContextUI #footer
 {
     flex-direction:row;
-    margin-bottom:1;
+    margin-bottom: 1px;
 }
 
 VFXContextUI #node-border > #inside > #title > #title-label
@@ -131,39 +130,39 @@ VFXContextUI #node-border > #inside > #title > #title-label
     -unity-text-align:middle-center;
 
     color:#c4c4c4;
-    font-size:18;
-    height:24;
+    font-size: 18px;
+    height: 24px;
 }
 VFXContextUI #footer #title-label
 {
-    font-size:11;
+    font-size: 11px;
     -unity-font-style: normal;
-    height:16;
+    height: 16px;
 }
 
 VFXContextUI #title #icon
 {
     --unity-image:resource("VFX/Execution");
-    margin-right:6;
+    margin-right: 6px;
 }
 
 VFXContextUI #header-space
 {
     position:absolute;
-    right:5;
-    top:5;
-    width:48;
-    height:16;
+    right: 5px;
+    top: 5px;
+    width: 48px;
+    height: 16px;
 }
 VFXContextUI > #node-border > #inside > #contents
 {
     margin-top : 0;
-    padding-top : 4;
-    border-radius:6;
+    padding-top : 4px;
+    border-radius: 6px;
     background-color: rgba(63,63,63,0.8);
-    margin-left:1;
-    margin-right:1;
-    font-size:11;
+    margin-left: 1px;
+    margin-right: 1px;
+    font-size: 11px;
 }
 VFXContextUI > #node-border > #inside > #contents > #settings
 {
@@ -195,11 +194,11 @@ VFXContextUI #block-container {
 
     color:#8FC1DF;
 
-    font-size:12;
+    font-size: 12px;
     margin-top: 0;
     margin-bottom: 0;
-    padding-top:2;
-    padding-bottom:2;
+    padding-top: 2px;
+    padding-bottom: 2px;
 }
 
 .flow-container
@@ -211,7 +210,7 @@ VFXContextUI #block-container {
     position: Absolute;
     left: 0;
     right: 0;
-    height: 28;
+    height: 28px;
 }
 
 #flow-outputs
@@ -220,31 +219,27 @@ VFXContextUI #block-container {
 }
 VFXContextUI #no-blocks
 {
-    border-left-width: 1;
-    border-right-width: 1;
-    border-bottom-width: 1;
-    border-top-width: 1;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    border-top-width: 1px;
     border-color: #393939;
     color: #393939;
-    height: 24;
+    height: 24px;
     -unity-text-align: middle-center;
-    border-radius:8;
+    border-radius: 8px;
 }
 
 VFXContextUI.graphElement #user-label
 {
-    border-top-width:1;
-    border-left-width:1;
-    border-right-width:1;
-    border-bottom-width:1;
-    border-top: 1;
-    border-left: 1;
-    border-right: 1;
-    border-bottom: 1;
-    margin-left:12;
-    margin-right:12;
-    margin-top:1;
-    margin-bottom:1;
+    border-top-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    margin-left: 12px;
+    margin-right: 12px;
+    margin-top: 1px;
+    margin-bottom: 1px;
     padding-left:0;
     padding-right:0;
 }
@@ -262,7 +257,7 @@ VFXContextUI.graphElement #user-label:hover
 
 * Label#user-label, * TextField#user-title-textfield
 {
-    font:resource("GraphView/DummyFont(LucidaGrande).ttf");
+    -unity-font: resource("GraphView/DummyFont(LucidaGrande).ttf");
 }
 
 TextField#user-title-textfield
@@ -271,39 +266,39 @@ TextField#user-title-textfield
     padding-right:0;
     padding-top:0;
     padding-bottom:0;
-    margin-left:1;
+    margin-left: 1px;
     margin-right:0;
-    margin-top:2;
+    margin-top: 2px;
     margin-bottom:0;
     background-color:#000;
-    position-type:Absolute;
-    min-height:24;
+    position: Absolute;
+    min-height: 24px;
 }
 
 #user-label, #user-title-textfield
 {
-    font-size:18;
-    word-wrap: true;
+    font-size: 18px;
+    white-space: normal;
 }
 
 #user-label
 {
-    text-color:#c4c4c4;
-    min-height:24;
+    color: #c4c4c4;
+    min-height: 24px;
 }
 
 VFXContextUI.inputTypespawnevent #user-label
 {
-    text-color:#00ff8f;
+    color: #00ff8f;
 }
 VFXContextUI.inputTypeparticle #user-label
 {
-    text-color:#FFBC21;
+    color: #FFBC21;
 }
 
 #user-label.empty
 {
-    height : 4;
+    height : 4px;
     min-height:0;
 }
 
diff --git a/package/Editor/Resources/VFXControls.uss b/package/Editor/Resources/VFXControls.uss
index 88a8ceff7..409b28b57 100755
--- a/package/Editor/Resources/VFXControls.uss
+++ b/package/Editor/Resources/VFXControls.uss
@@ -1,13 +1,13 @@
 /*FloatField {
-    min-height: 15;
-    margin-left: 4;
-    margin-top: 2;
-    margin-right: 4;
-    margin-bottom: 2;
-    padding-left: 3;
-    padding-top: 1;
-    padding-right: 3;
-    padding-bottom: 2;
+    min-height: 15px;
+    margin-left: 4px;
+    margin-top: 2px;
+    margin-right: 4px;
+    margin-bottom: 2px;
+    padding-left: 3px;
+    padding-top: 1px;
+    padding-right: 3px;
+    padding-bottom: 2px;
     -unity-slice-left: 3;
     -unity-slice-top: 3;
     -unity-slice-right: 3;
@@ -31,12 +31,12 @@ VFXColorField #indeterminate
 
 .unity-curve-field
 {
-    height:16;
+    height: 16px;
     background-color:rgb(86, 86, 86);
-    border-left-width:1;
-    border-right-width:1;
-    border-top-width:1;
-    border-bottom-width:1;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
     border-color:#000;
 }
 
@@ -50,31 +50,31 @@ VFXColorField #indeterminate
 }
 .sliderField #Field
 {
-    width:40;
+    width: 40px;
     flex:0 0 auto;
 }
 .sliderField #indeterminate
 {
-    width:40;
+    width: 40px;
     flex:0 0 auto;
 }
 
 .PopupButton
 {
     -unity-text-align:middle-left;
-    height: 16;
+    height: 16px;
     -unity-slice-left: 6;
     -unity-slice-top: 4;
     -unity-slice-right: 14;
     -unity-slice-bottom: 4;
     color: #B4B4B4;
-    padding-right:14;
-    padding-left:4;
+    padding-right: 14px;
+    padding-left: 4px;
 }
 
 VFXEnumField .PopupButton
 {
-    padding-bottom:4;
+    padding-bottom: 4px;
 }
 
 VFXEnumField .PopupButton:hover
@@ -84,12 +84,12 @@ VFXEnumField .PopupButton:hover
 
 VFXStringFieldPushButton
 {
-    height:16;
+    height: 16px;
 }
 
 VFXStringFieldPushButton .unity-button
 {
-    height:16;
+    height: 16px;
 }
 
 .unity-button.MiniDropDown
diff --git a/package/Editor/Resources/VFXDataAnchor.uss b/package/Editor/Resources/VFXDataAnchor.uss
index bd700bddf..c07110c7f 100755
--- a/package/Editor/Resources/VFXDataAnchor.uss
+++ b/package/Editor/Resources/VFXDataAnchor.uss
@@ -12,13 +12,12 @@
     align-items: center;
     -unity-font-style: normal;
     color: #BBB;
-    font-size:11;
+    font-size: 11px;
     padding-bottom:0;
-    min-height:18;
-    height:-1;
+    min-height: 18px;
+    height: -1px;
     margin-bottom:0;
-    margin-right:4;
-    Visible:true;
+    margin-right: 4px;
 }
 
 .VFXDataAnchor #lineSpacer
@@ -60,8 +59,8 @@
     left:0;
     top:0;
     bottom:0;
-    width:-1;
-    height:-1;
+    width: -1px;
+    height: -1px;
 }
 
 
@@ -70,12 +69,11 @@
     max-height:0;
     min-height:0;
     height:0;
-    Visible:false;
 }
 
 .VFXDataAnchor.hidden #connector
 {
-    margin-top:-12;
+    margin-top: -12px;
     border-left-width:0;
     border-right-width:0;
     border-top-width:0;
@@ -107,17 +105,17 @@ VFXDataAnchor.Output #type
 
 .VFXDataAnchor .space
 {
-    border-radius:4;
-    border-left-width:1;
-    border-right-width:1;
-    border-top-width:1;
-    border-bottom-width:1;
-    margin-top:4;
-    margin-bottom:4;
-    padding-left:4;
-    padding-right:4;
-    padding-bottom:2;
-    margin-right:10;
+    border-radius: 4px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    margin-top: 4px;
+    margin-bottom: 4px;
+    padding-left: 4px;
+    padding-right: 4px;
+    padding-bottom: 2px;
+    margin-right: 10px;
     border-color: rgb(153,153,153);
     color: rgb(153,153,153);
     -unity-text-align: middle-center;
@@ -125,8 +123,8 @@ VFXDataAnchor.Output #type
 
 .VFXOutputDataAnchor #icon
 {
-    width:13;
-    height:13;
+    width: 13px;
+    height: 13px;
 }
 .VFXOutputDataAnchor.icon-expandable #icon
 {
@@ -157,7 +155,7 @@ VFXDataAnchor.Output #type
 .VFXOutputDataAnchor #type
 {
     color:#c4c4c4;
-    margin-right:12;
+    margin-right: 12px;
     flex-grow:1;
 }
 
diff --git a/package/Editor/Resources/VFXFlow.uss b/package/Editor/Resources/VFXFlow.uss
index ebf3e4717..54ea674ff 100755
--- a/package/Editor/Resources/VFXFlow.uss
+++ b/package/Editor/Resources/VFXFlow.uss
@@ -13,10 +13,10 @@ VFXFlowAnchor.port.EdgeConnector
 {
     padding-left:0;
     padding-right:0;
-    margin-left:12;
-    margin-right:12;
-    width:100;
-    height:28;
+    margin-left: 12px;
+    margin-right: 12px;
+    width: 100px;
+    height: 28px;
     --port-color:rgb(220, 220, 220);
     flex-direction:column-reverse;
 }
@@ -29,18 +29,18 @@ VFXFlowAnchor.port.EdgeConnector.output
 
 VFXFlowAnchor.port.EdgeConnector #connector
 {
-    width:12;
-    height:12;
-    margin-left:2;
-    margin-right:2;
+    width: 12px;
+    height: 12px;
+    margin-left: 2px;
+    margin-right: 2px;
 }
 
 VFXFlowAnchor.port.EdgeConnector #type
 {
     position:Absolute;
-    width:42;
-    top:1;
-    left:58;
+    width: 42px;
+    top: 1px;
+    left: 58px;
     margin-left:0;
     margin-right:0;
 }
@@ -48,8 +48,8 @@ VFXFlowAnchor.port.EdgeConnector #type
 
 VFXFlowAnchor.port.EdgeConnector #connector #cap
 {
-    width:8;
-    height:8;
+    width: 8px;
+    height: 8px;
 }
 
 VFXFlowAnchor.connected #connector
diff --git a/package/Editor/Resources/VFXNode.uss b/package/Editor/Resources/VFXNode.uss
index ffbc7eb21..e338ce9ee 100755
--- a/package/Editor/Resources/VFXNode.uss
+++ b/package/Editor/Resources/VFXNode.uss
@@ -11,8 +11,8 @@
    
 
 #divider.horizontal {
-    height:0.01;
-    border-bottom-width: 1;
+    height: 0.01px;
+    border-bottom-width: 1px;
 }
 
 #divider.horizontal.hidden {
@@ -21,8 +21,8 @@
 }
 
 #divider.vertical {
-    width:0.01;
-    border-right-width: 1;
+    width: 0.01px;
+    border-right-width: 1px;
 }
 
 #divider.vertical.hidden {
@@ -49,11 +49,11 @@
 
 .VFXNodeUI #settings
 {
-    margin-top:8;
-    margin-bottom:8;
-    margin-right:4;
-    margin-left:16; /* this is meant to compense for data anchors connector, so that settings labels are aligned with input labels. */
-    padding-right:4;
+    margin-top: 8px;
+    margin-bottom: 8px;
+    margin-right: 4px;
+    margin-left: 16px; /* this is meant to compense for data anchors connector, so that settings labels are aligned with input labels. */
+    padding-right: 4px;
     overflow:hidden;
 }
 
@@ -84,16 +84,16 @@
 
 .VFXNodeUI.node #contents > #top > #input
 {
-    padding-top:6;
-    padding-bottom:6;
+    padding-top: 6px;
+    padding-bottom: 6px;
     flex: 1 1 auto;
     background-color: rgba(0,0,0,0.0);
 }
 
 .VFXNodeUI.node #contents > #top > #output
 {
-    padding-top:6;
-    padding-bottom:6;
+    padding-top: 6px;
+    padding-bottom: 6px;
 }
 
 #line
@@ -105,8 +105,8 @@
 {
     background-color: rgba(35,35,35,0.8);
     border-color: rgba(35,35,35,0.8);
-    height:0.01;
-    border-bottom-width: 1;
+    height: 0.01px;
+    border-bottom-width: 1px;
 }
 
 #settings-divider.hidden
diff --git a/package/Editor/Resources/VFXNodeUI.uss b/package/Editor/Resources/VFXNodeUI.uss
index b9b018b9f..9887955ce 100755
--- a/package/Editor/Resources/VFXNodeUI.uss
+++ b/package/Editor/Resources/VFXNodeUI.uss
@@ -8,11 +8,11 @@
     border-top-width:0;
     border-right-width:0;
     border-bottom-width:0;
-    border-radius: 8;
-    margin-bottom:1;
-    margin-left:1;
-    margin-right:1;
-    margin-top:1;
+    border-radius: 8px;
+    margin-bottom: 1px;
+    margin-left: 1px;
+    margin-right: 1px;
+    margin-top: 1px;
     position: absolute;
     left:0;
     right:0;
@@ -22,24 +22,24 @@
 
 :hover > #selection-border {
     border-color: rgba(68,192,255, 0.5);
-    border-top-width:1;
-    border-left-width:1;
-    border-right-width:1;
-    border-bottom-width:1;
+    border-top-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
 }
 
 :selected > #selection-border {
     border-color: #44C0FF;
-    border-left-width:1;
-    border-top-width:1;
-    border-right-width:1;
-    border-bottom-width:1;
+    border-left-width: 1px;
+    border-top-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
 }
 
 :selected:hover > #selection-border {
     border-color: #44C0FF;
-    border-top-width:2;
-    border-left-width:2;
-    border-right-width:2;
-    border-bottom-width:2;
+    border-top-width: 2px;
+    border-left-width: 2px;
+    border-right-width: 2px;
+    border-bottom-width: 2px;
 }
diff --git a/package/Editor/Resources/VFXOperator.uss b/package/Editor/Resources/VFXOperator.uss
index 82d6a8db7..524800861 100755
--- a/package/Editor/Resources/VFXOperator.uss
+++ b/package/Editor/Resources/VFXOperator.uss
@@ -7,7 +7,7 @@ VFXOperatorUI.node #middle
 
 VFXOperatorUI #title #edit
 {
-   width:28;
+   width: 28px;
    flex-direction:column;
    justify-content:center;
 }
@@ -15,14 +15,14 @@ VFXOperatorUI #title #edit
 VFXOperatorUI #title #edit #icon
 {
     background-image: resource("VFX/EditStolen");
-    width:15;
-    height:14;
+    width: 15px;
+    height: 14px;
     align-self:center;
 }
 
 OperandInfo *
 {
-    height:16;
+    height: 16px;
 }
 OperandInfo .unity-text-field
 {
@@ -32,7 +32,7 @@ OperandInfo .unity-text-field
 OperandInfo .PopupButton
 {
     flex:0 0 auto;
-    width:55;
+    width: 55px;
 }
 
 VFXUnifiedOperatorEdit OperandInfo .unity-label
@@ -41,7 +41,7 @@ VFXUnifiedOperatorEdit OperandInfo .unity-label
 }
 VFXUnifiedOperatorEdit OperandInfo .PopupButton
 {
-    width:80;
+    width: 80px;
 }
 
 #edit-container
@@ -65,8 +65,8 @@ VFXUnifiedOperatorEdit OperandInfo .PopupButton
 }
 .VFXUniformOperatorEdit#edit-container .unity-label
 {
-    margin-left:8;
-    margin-right:8;
+    margin-left: 8px;
+    margin-right: 8px;
 }
 
 
@@ -85,8 +85,8 @@ VFXOperatorUI.superCollapsed.VFXNodeUI.node #settings-divider, VFXOperatorUI.sup
 
 .VFXNodeUI.superCollapsed
 {
-height:30;
-width:-1;
+height: 30px;
+width: -1px;
 }
 
 .VFXNodeUI.VFXNodeUI.superCollapsed #settings
@@ -113,16 +113,16 @@ width:-1;
     right:0;
     top:0;
     bottom:0;
-    height:-1;
+    height: -1px;
     margin-bottom:0;
-    border-bottom-left-radius:2;
-    border-bottom-right-radius:2;
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px;
 }
 .VFXNodeUI.node.superCollapsed #node-border > #title > .unity-label#title-label {
-    margin-bottom:3;
-    margin-top:3;
-    margin-left:20;
-    margin-right:20;
+    margin-bottom: 3px;
+    margin-top: 3px;
+    margin-left: 20px;
+    margin-right: 20px;
 }
 
 .VFXNodeUI.node.superCollapsed .mainContainer, .VFXNodeUI.superCollapsed #contents, .VFXNodeUI.superCollapsed #contents > #top
@@ -155,16 +155,16 @@ width:-1;
     position:Absolute;
     top:0;
     bottom:0;
-    right:1;
+    right: 1px;
     flex-grow:0;
     flex:0 0 auto;
-    width:20;
+    width: 20px;
     background-color:rgba(0,0,0,0);
 }
 .VFXNodeUI.node.superCollapsed #right #output
 {
     align-self:flex-end;
-    width:16;
+    width: 16px;
 }
 
 .VFXNodeUI.superCollapsed #type
@@ -205,13 +205,13 @@ width:-1;
 }
 .VFXNodeUI.superCollapsed.node .mainContainer #left
 {
-    width:120;
+    width: 120px;
 }
 .VFXNodeUI.superCollapsed.node .VFXDataAnchor
 {
     position:Absolute;
     left:0;
-    width:16;
+    width: 16px;
     top:0;
     bottom:0;
 }
@@ -219,7 +219,7 @@ width:-1;
 {
     position:Absolute;
     right:0;
-    width:-1;
+    width: -1px;
     top:0;
     bottom:0;
 }
diff --git a/package/Editor/Resources/VFXParameter.uss b/package/Editor/Resources/VFXParameter.uss
index 29744ca1c..eba453a25 100755
--- a/package/Editor/Resources/VFXParameter.uss
+++ b/package/Editor/Resources/VFXParameter.uss
@@ -1,9 +1,9 @@
 
 VFXParameterUI.node > #node-border > #title
 {
-    font-size:11;
-    height:-1;
-    padding-left:8;
+    font-size: 11px;
+    height: -1px;
+    padding-left: 8px;
 }
 
 VFXParameterUI.node.superCollapsed > #node-border > #title > #title-label
@@ -16,38 +16,37 @@ VFXParameterUI.node.superCollapsed > #node-border > #title > #title-label
     padding-left:0;
     padding-top:0;
     padding-bottom:0;
-    font-size:11;
+    font-size: 11px;
 }
 
 VFXParameterUI.node > #node-border > #title > #pill
 {
-    border-radius:10;
+    border-radius: 10px;
     background-image: resource("GraphView/Nodes/BlackboardFieldPillBackground.png");
     flex-direction:row;
-    padding-left:8;
-    -margin-left:8;
-    margin-right:8;
-    margin-top:8;
-    margin-bottom:8;
+    padding-left: 8px;
+    margin-right: 8px;
+    margin-top: 8px;
+    margin-bottom: 8px;
 }
 
 VFXParameterUI.node.hovered > #selection-border
 {
     background-color:rgba(68,192,255,0.4);
     border-color:rgba(68,192,255,1);
-    border-left-width:2;
-    border-right-width:2;
-    border-top-width:2;
-    border-bottom-width:2;
+    border-left-width: 2px;
+    border-right-width: 2px;
+    border-top-width: 2px;
+    border-bottom-width: 2px;
 }
 
 VFXParameterUI.node:hover > #selection-border
 {
     border-color:rgba(68,192,255,1);
-    border-left-width:1;
-    border-right-width:1;
-    border-top-width:1;
-    border-bottom-width:1;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
 }
 VFXParameterUI.node.superCollapsed > #node-border
 {
@@ -56,11 +55,11 @@ VFXParameterUI.node.superCollapsed > #node-border
 
 VFXParameterUI.node.superCollapsed > #selection-border
 {
-    margin-top:10;
-    margin-bottom:10;
-    margin-left:10;
-    margin-right:10;
-    border-radius:12;
+    margin-top: 10px;
+    margin-bottom: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
+    border-radius: 12px;
 }
 
 VFXParameterUI.node.superCollapsed > #node-border > #title
@@ -91,13 +90,13 @@ VFXParameterUI.node.superCollapsed > #node-border > #contents .VFXDataAnchor.Out
     overflow:hidden;
     position:Absolute;
     padding-left:0;
-    top:22; /*hard coding the position so that edge are at the right height*/
+    top: 22px; /*hard coding the position so that edge are at the right height*/
 }
 
 VFXParameterUI.node.superCollapsed > #node-border > #contents .VFXDataAnchor.Output.first
 {
-    height:20;
-    width:20;
+    height: 20px;
+    width: 20px;
     position:Relative;
     top:0;
 }
@@ -113,7 +112,7 @@ VFXParameterUI.node.superCollapsed > #node-border > #contents .VFXDataAnchor.Out
 }
 VFXParameterUI.node.superCollapsed > #node-border > #contents .VFXDataAnchor.Output.first #connector
 {
-    margin-right:10;
+    margin-right: 10px;
     margin-left:0;
 }
 
@@ -138,8 +137,8 @@ VFXParameterUI.node > #node-border > #title > #pill > #exposed-icon
 VFXParameterUI.node.exposed > #node-border > #title > #pill > #exposed-icon
 {
     --unity-image:resource("VFX/exposed dot");
-    width:6;
-    height:6;
+    width: 6px;
+    height: 6px;
 }
 
 .node.superCollapsed #super-collapse-button > #icon {
@@ -151,16 +150,16 @@ VFXParameterUI.node.exposed > #node-border > #title > #pill > #exposed-icon
 }
 
 #super-collapse-button {
-    width:20;
-    margin-right:18;
+    width: 20px;
+    margin-right: 18px;
     flex-direction:column;
     justify-content:center;
-    padding-left:4;
+    padding-left: 4px;
 }
 
 #super-collapse-button >  #icon {
-    width:12;
-    height:12;
+    width: 12px;
+    height: 12px;
     align-self:center;
     opacity: 0.5;
 }
diff --git a/package/Editor/Resources/VFXReorderableList.uss b/package/Editor/Resources/VFXReorderableList.uss
index c6ae01c2e..53f3cc7f2 100755
--- a/package/Editor/Resources/VFXReorderableList.uss
+++ b/package/Editor/Resources/VFXReorderableList.uss
@@ -10,8 +10,8 @@
 .ReorderableList > #ListContainer
 {
     background-color:#383838;
-    padding-top:2;
-    padding-bottom:4;
+    padding-top: 2px;
+    padding-bottom: 4px;
 }
 
 .ReorderableList > * > *
@@ -27,7 +27,7 @@
 
 .ReorderableList > * > * > #DraggingHandle
 {
-    width: 16;
+    width: 16px;
     align-items:center;
     justify-content:center;
 }
@@ -41,28 +41,28 @@
 
 .ReorderableList > #Toolbar > *
 {
-    height:16;
-    width:32;
+    height: 16px;
+    width: 32px;
     justify-content:center;
 }
 
 .ReorderableList > #Toolbar > #Add
 {
-    border-bottom-left-radius:4;
+    border-bottom-left-radius: 4px;
 }
 .ReorderableList > #Toolbar > #Remove
 {
-    border-bottom-right-radius:4;
+    border-bottom-right-radius: 4px;
 }
 
 .ReorderableList > #Toolbar > * > #icon
 {
-    width:16;
-    height:16;
+    width: 16px;
+    height: 16px;
 }
 
 #DraggingHandle #icon
 {
-    width: 10;
-    height: 6
+    width: 10px;
+    height: 6px;
 }
diff --git a/package/Editor/Resources/VFXSystemBorder.uss b/package/Editor/Resources/VFXSystemBorder.uss
index 6370aee35..0c6d6d196 100755
--- a/package/Editor/Resources/VFXSystemBorder.uss
+++ b/package/Editor/Resources/VFXSystemBorder.uss
@@ -1,6 +1,6 @@
 * Label#title, * TextField#title-field
 {
-    font:resource("GraphView/DummyFont(LucidaGrande).ttf");
+    -unity-font: resource("GraphView/DummyFont(LucidaGrande).ttf");
 }
 
 VFXSystemBorder.graphElement
@@ -8,8 +8,7 @@ VFXSystemBorder.graphElement
     --start-color:#17AB6A;
     --middle-color:#BF9220;
     --end-color:#C24F30;
-    border-width: 6;
-    border: 6;
+    border-width: 6px;
     opacity:0.25;
     flex-direction:column;
     align-items:stretch;
@@ -18,18 +17,18 @@ VFXSystemBorder.graphElement
 
 VFXSystemBorder.graphElement Label
 {
-    border-top-width:1;
-    border-left-width:1;
-    border-right-width:1;
-    border-bottom-width:1;
-    border-top: 1;
-    border-left: 1;
-    border-right: 1;
-    border-bottom: 1;
-    margin-left:12;
-    margin-right:12;
-    margin-top:1;
-    margin-bottom:1;
+    border-top-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    border-top-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-bottom-width: 1px;
+    margin-left: 12px;
+    margin-right: 12px;
+    margin-top: 1px;
+    margin-bottom: 1px;
     padding-left:0;
     padding-right:0;
 }
@@ -42,13 +41,13 @@ VFXSystemBorder.graphElement Label:hover
 
 #title-field
 {
-    position-type:absolute;
+    position: absolute;
 }
 
 #title, #title-field
 {
-    font-size:48;
-    word-wrap: true;
+    font-size: 48px;
+    white-space: normal;
 }
 
 #title
@@ -59,7 +58,7 @@ VFXSystemBorder.graphElement Label:hover
 
 #title.empty
 {
-    height : 12;
+    height : 12px;
 }
 
 VFXSystemBorder.graphElement TextField#title-field
@@ -72,7 +71,7 @@ VFXSystemBorder.graphElement TextField#title-field
     margin-right:0;
     margin-top:0;
     margin-bottom:0;
-    border-top-width:1;
+    border-top-width: 1px;
     background-color:#000;
-    position-type:absolute;
+    position: absolute;
 }
diff --git a/package/Editor/Resources/VFXView.uss b/package/Editor/Resources/VFXView.uss
index 6c7001b92..90104d7c6 100755
--- a/package/Editor/Resources/VFXView.uss
+++ b/package/Editor/Resources/VFXView.uss
@@ -8,8 +8,8 @@ VFXView
     position:absolute;
     left:0;
     right: 0;
-    height:4;
-    margin-top:-2;
+    height: 4px;
+    margin-top: -2px;
     background-color: rgb(210, 152, 0);
 }
 
@@ -17,7 +17,7 @@ VFXView
     background-image: resource("Builtin Skins/DarkSkin/Images/Toolbar.png");
     -unity-slice-top:2;
     -unity-slice-bottom:2;
-    height:17;
+    height: 17px;
     position:absolute;
     top:0;
     left:0;
@@ -27,14 +27,14 @@ VFXView
 
 .toolbarItem
 {
-    padding-bottom:3;
-    padding-top:3;
+    padding-bottom: 3px;
+    padding-top: 3px;
 }
 
 .toolbarItem, .toolbarItem *
 {
     color:#ababab;
-    font-size:11;
+    font-size: 11px;
 }
 .toolbarItem *
 {
@@ -48,14 +48,14 @@ VFXView
     background-image: resource("Builtin Skins/DarkSkin/Images/toolbar button.png");
     -unity-slice-left:6;
     -unity-slice-right:6;
-    height:17;
-    min-height:17;
+    height: 17px;
+    min-height: 17px;
     margin-left:0;
     margin-right:0;
     margin-bottom:0;
     margin-top:0;
-    padding-left:12;
-    padding-right:12;
+    padding-left: 12px;
+    padding-right: 12px;
 }
 
 .unity-button.toolbarItem:hover:active
@@ -68,15 +68,15 @@ VFXView
     background-image: resource("Builtin Skins/DarkSkin/Images/toolbar button.png");
     -unity-slice-left:6;
     -unity-slice-right:6;
-    height:17;
+    height: 17px;
     margin-left:0;
     margin-right:0;
     margin-bottom:0;
     margin-top:0;
     padding-top:0;
     padding-bottom:0;
-    padding-left:12;
-    padding-right:12;
+    padding-left: 12px;
+    padding-right: 12px;
 }
 
 .unity-toggle.toolbarItem >* > #unity-checkmark,.unity-toggle.toolbarItem:checked >* > #unity-checkmark,.unity-toggle.toolbarItem:hover:active >* > #unity-checkmark,.unity-toggle.toolbarItem:hover:active:checked >* > #unity-checkmark
diff --git a/package/Editor/Templates/Empty Particle System.vfx b/package/Editor/Templates/Empty Particle System.vfx
index 4bd6840a4..74bc3ae7f 100755
--- a/package/Editor/Templates/Empty Particle System.vfx	
+++ b/package/Editor/Templates/Empty Particle System.vfx	
@@ -9,6 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 73a13919d81fb7444849bae8b5c812a2, type: 3}
   m_Name: VFXBasicSpawner
   m_EditorClassIdentifier: 
@@ -37,6 +38,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a0b9e6b9139e58d4c957ec54595da7d3, type: 3}
   m_Name: VFXQuadOutput
   m_EditorClassIdentifier: 
@@ -77,6 +79,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
   m_Name: VFXSlotTexture2D
   m_EditorClassIdentifier: 
@@ -111,6 +114,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 1b605c022ee79394a8a776c0869b3f9a, type: 3}
   m_Name: VFXSlot
   m_EditorClassIdentifier: 
@@ -147,6 +151,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d01270efd3285ea4a9d6c555cb0a8027, type: 3}
   m_Name: VFXUI
   m_EditorClassIdentifier: 
@@ -169,6 +174,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 7d4c867f6b72b714dbb5fd1780afe208, type: 3}
   m_Name: Empty Particle System
   m_EditorClassIdentifier: 
@@ -194,6 +200,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -227,6 +234,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d78581a96eae8bf4398c282eb0b098bd, type: 3}
   m_Name: VFXDataParticle
   m_EditorClassIdentifier: 
@@ -251,6 +259,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -284,6 +293,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -317,6 +327,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -350,6 +361,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 2dc095764ededfa4bb32fa602511ea4b, type: 3}
   m_Name: VFXBasicUpdate
   m_EditorClassIdentifier: 
@@ -383,6 +395,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -416,6 +429,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -449,6 +463,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 9dfea48843f53fc438eabc12a3a30abc, type: 3}
   m_Name: VFXBasicInitialize
   m_EditorClassIdentifier: 
@@ -479,6 +494,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -521,6 +537,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -647,7 +664,7 @@ VisualEffectResource:
       deadListCount;\n\t\t#endif\n\t\t\n\t\tCBUFFER_START(outputParams)\n\t\t\tfloat
       nbMax;\n\t\t\tfloat systemSeed;\n\t\tCBUFFER_END\n\t\t\n\t\tENDHLSL\n\t\t\n\n\t\t\n\t\t//
       Forward pass\n\t\tPass\n\t\t{\t\t\n\t\t\tTags { \"LightMode\"=\"ForwardOnly\"
-      }\n\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma target 4.5\n\t\t\t\n\t\t\n\t\t\tstruct
+      }\n\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma target 4.5\n\t\t\t\t\n\t\t\tstruct
       ps_input\n\t\t\t{\n\t\t\t\tfloat4 pos : SV_POSITION;\n\t\t\t\t#if USE_FLIPBOOK_INTERPOLATION\n\t\t\t\tfloat4
       uv : TEXCOORD0;\n\t\t\t\t#else\n\t\t\t\tfloat2 uv : TEXCOORD0;\t\n\t\t\t\t#endif\n\t\t\t\t#if
       VFX_NEEDS_COLOR_INTERPOLATOR\n\t\t\t\tnointerpolation float4 color : COLOR0;\n\t\t\t\t#endif\n\t\t\t\t#if
@@ -698,11 +715,11 @@ VisualEffectResource:
       *= scaleY;\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t#if VFX_USE_SCALEZ_CURRENT\n\t\t\t\t\t\tsize3.z
       *= scaleZ;\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\tconst float2
       vOffsets = o.VFX_VARYING_UV.xy - 0.5f;\n\t\t\t\tconst float4x4 elementToVFX
-      = GetElementToVFXMatrix(axisX,axisY,axisZ,float3(angleX,angleY,angleZ),float3(pivotX,pivotY,pivotZ),size3,position);\n\t\t\t\t\t
-      \ float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;\n\t\t\t\n\t\t\t\to.VFX_VARYING_POSCS
-      = TransformPositionVFXToClip(vPos);\n\t\t\t\n\t\t\t\tfloat3 normalWS = normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));\n\t\t\t\t#ifdef
-      VFX_VARYING_NORMAL\n\t\t\t\tfloat normalFlip = (size3.x * size3.y * size3.z)
-      < 0 ? -1 : 1;\n\t\t\t\to.VFX_VARYING_NORMAL = normalFlip * normalWS;\n\t\t\t\t#endif\n\t\t\t\t#ifdef
+      = GetElementToVFXMatrix(axisX,axisY,axisZ,float3(angleX,angleY,angleZ),float3(pivotX,pivotY,pivotZ),size3,position);\n\t\t\t\tconst
+      float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;\n\t\t\t\n\t\t\t\to.VFX_VARYING_POSCS
+      = TransformPositionVFXToClip(vPos);\n\t\t\t\t\n\t\t\t\t#ifdef VFX_VARYING_NORMAL\n\t\t\t\tfloat
+      normalFlip = (size3.x * size3.y * size3.z) < 0 ? -1 : 1;\n\t\t\t\to.VFX_VARYING_NORMAL
+      = normalFlip * normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));\n\t\t\t\t#endif\n\t\t\t\t#ifdef
       VFX_VARYING_TANGENT\n\t\t\t\to.VFX_VARYING_TANGENT = normalize(TransformDirectionVFXToWorld(normalize(transpose(elementToVFX)[0].xyz)));\n\t\t\t\t#endif\n\t\t\t\t#ifdef
       VFX_VARYING_BENTFACTORS\n\t\t\t\t\n\t\t\t\to.VFX_VARYING_BENTFACTORS = vOffsets
       * bentNormalFactor;\n\t\t\t\t#endif\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t#if VFX_USE_COLOR_CURRENT
diff --git a/package/Editor/Templates/Simple Particle System.vfx b/package/Editor/Templates/Simple Particle System.vfx
index f81b33bb1..6dfdbadea 100755
--- a/package/Editor/Templates/Simple Particle System.vfx	
+++ b/package/Editor/Templates/Simple Particle System.vfx	
@@ -9,6 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 73a13919d81fb7444849bae8b5c812a2, type: 3}
   m_Name: VFXBasicSpawner
   m_EditorClassIdentifier: 
@@ -38,6 +39,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a0b9e6b9139e58d4c957ec54595da7d3, type: 3}
   m_Name: VFXQuadOutput
   m_EditorClassIdentifier: 
@@ -81,6 +83,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a971fa2e110a0ac42ac1d8dae408704b, type: 3}
   m_Name: SetAttribute
   m_EditorClassIdentifier: 
@@ -108,6 +111,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
   m_Name: VFXSlotTexture2D
   m_EditorClassIdentifier: 
@@ -142,6 +146,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a971fa2e110a0ac42ac1d8dae408704b, type: 3}
   m_Name: SetAttribute
   m_EditorClassIdentifier: 
@@ -169,6 +174,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -206,6 +212,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -239,6 +246,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 1b605c022ee79394a8a776c0869b3f9a, type: 3}
   m_Name: VFXSlot
   m_EditorClassIdentifier: 
@@ -275,6 +283,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -308,6 +317,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d01270efd3285ea4a9d6c555cb0a8027, type: 3}
   m_Name: VFXUI
   m_EditorClassIdentifier: 
@@ -330,6 +340,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 7d4c867f6b72b714dbb5fd1780afe208, type: 3}
   m_Name: Simple Particle System
   m_EditorClassIdentifier: 
@@ -355,6 +366,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -388,6 +400,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d78581a96eae8bf4398c282eb0b098bd, type: 3}
   m_Name: VFXDataParticle
   m_EditorClassIdentifier: 
@@ -412,6 +425,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -449,6 +463,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -482,6 +497,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -515,6 +531,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -548,6 +565,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -594,6 +612,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d16c6aeaef944094b9a1633041804207, type: 3}
   m_Name: Orient
   m_EditorClassIdentifier: 
@@ -615,6 +634,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 956b68870e880b144bab17e5aa6e7e94, type: 3}
   m_Name: ColorOverLife
   m_EditorClassIdentifier: 
@@ -639,6 +659,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -672,6 +693,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -705,6 +727,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 2dc095764ededfa4bb32fa602511ea4b, type: 3}
   m_Name: VFXBasicUpdate
   m_EditorClassIdentifier: 
@@ -738,6 +761,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -772,6 +796,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f05c6884b705ce14d82ae720f0ec209f, type: 3}
   m_Name: VFXSpawnerConstantRate
   m_EditorClassIdentifier: 
@@ -793,6 +818,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 76f778ff57c4e8145b9681fe3268d8e9, type: 3}
   m_Name: VFXSlotGradient
   m_EditorClassIdentifier: 
@@ -833,6 +859,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -866,6 +893,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -899,6 +927,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 9dfea48843f53fc438eabc12a3a30abc, type: 3}
   m_Name: VFXBasicInitialize
   m_EditorClassIdentifier: 
@@ -931,6 +960,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -965,6 +995,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -1007,6 +1038,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -1040,6 +1072,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -1073,6 +1106,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -1248,7 +1282,7 @@ VisualEffectResource:
       deadListCount;\n\t\t#endif\n\t\t\n\t\tCBUFFER_START(outputParams)\n\t\t\tfloat
       nbMax;\n\t\t\tfloat systemSeed;\n\t\tCBUFFER_END\n\t\t\n\t\tENDHLSL\n\t\t\n\n\t\t\n\t\t//
       Forward pass\n\t\tPass\n\t\t{\t\t\n\t\t\tTags { \"LightMode\"=\"ForwardOnly\"
-      }\n\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma target 4.5\n\t\t\t\n\t\t\n\t\t\tstruct
+      }\n\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma target 4.5\n\t\t\t\t\n\t\t\tstruct
       ps_input\n\t\t\t{\n\t\t\t\tfloat4 pos : SV_POSITION;\n\t\t\t\t#if USE_FLIPBOOK_INTERPOLATION\n\t\t\t\tfloat4
       uv : TEXCOORD0;\n\t\t\t\t#else\n\t\t\t\tfloat2 uv : TEXCOORD0;\t\n\t\t\t\t#endif\n\t\t\t\t#if
       VFX_NEEDS_COLOR_INTERPOLATOR\n\t\t\t\tnointerpolation float4 color : COLOR0;\n\t\t\t\t#endif\n\t\t\t\t#if
@@ -1324,11 +1358,11 @@ VisualEffectResource:
       *= scaleY;\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t#if VFX_USE_SCALEZ_CURRENT\n\t\t\t\t\t\tsize3.z
       *= scaleZ;\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\tconst float2
       vOffsets = o.VFX_VARYING_UV.xy - 0.5f;\n\t\t\t\tconst float4x4 elementToVFX
-      = GetElementToVFXMatrix(axisX,axisY,axisZ,float3(angleX,angleY,angleZ),float3(pivotX,pivotY,pivotZ),size3,position);\n\t\t\t\t\t
-      \ float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;\n\t\t\t\n\t\t\t\to.VFX_VARYING_POSCS
-      = TransformPositionVFXToClip(vPos);\n\t\t\t\n\t\t\t\tfloat3 normalWS = normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));\n\t\t\t\t#ifdef
-      VFX_VARYING_NORMAL\n\t\t\t\tfloat normalFlip = (size3.x * size3.y * size3.z)
-      < 0 ? -1 : 1;\n\t\t\t\to.VFX_VARYING_NORMAL = normalFlip * normalWS;\n\t\t\t\t#endif\n\t\t\t\t#ifdef
+      = GetElementToVFXMatrix(axisX,axisY,axisZ,float3(angleX,angleY,angleZ),float3(pivotX,pivotY,pivotZ),size3,position);\n\t\t\t\tconst
+      float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;\n\t\t\t\n\t\t\t\to.VFX_VARYING_POSCS
+      = TransformPositionVFXToClip(vPos);\n\t\t\t\t\n\t\t\t\t#ifdef VFX_VARYING_NORMAL\n\t\t\t\tfloat
+      normalFlip = (size3.x * size3.y * size3.z) < 0 ? -1 : 1;\n\t\t\t\to.VFX_VARYING_NORMAL
+      = normalFlip * normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));\n\t\t\t\t#endif\n\t\t\t\t#ifdef
       VFX_VARYING_TANGENT\n\t\t\t\to.VFX_VARYING_TANGENT = normalize(TransformDirectionVFXToWorld(normalize(transpose(elementToVFX)[0].xyz)));\n\t\t\t\t#endif\n\t\t\t\t#ifdef
       VFX_VARYING_BENTFACTORS\n\t\t\t\t\n\t\t\t\to.VFX_VARYING_BENTFACTORS = vOffsets
       * bentNormalFactor;\n\t\t\t\t#endif\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t#if VFX_USE_COLOR_CURRENT
@@ -1829,6 +1863,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 01ec2c1930009b04ea08905b47262415, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -1857,6 +1892,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: c117b74c5c58db542bffe25c78fe92db, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
diff --git a/package/Editor/Templates/Simple Static Mesh.vfx b/package/Editor/Templates/Simple Static Mesh.vfx
index c878e0e00..5e592ce85 100755
--- a/package/Editor/Templates/Simple Static Mesh.vfx	
+++ b/package/Editor/Templates/Simple Static Mesh.vfx	
@@ -9,6 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 7d4c867f6b72b714dbb5fd1780afe208, type: 3}
   m_Name: Simple Static Mesh
   m_EditorClassIdentifier: 
@@ -31,6 +32,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: b47b8679b468b7347a00cdd50589bc9f, type: 3}
   m_Name: VFXSlotMesh
   m_EditorClassIdentifier: 
@@ -65,6 +67,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d01270efd3285ea4a9d6c555cb0a8027, type: 3}
   m_Name: VFXUI
   m_EditorClassIdentifier: 
@@ -87,6 +90,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 5c71b248ba46954449b47392dc6c3bf9, type: 3}
   m_Name: VFXStaticMeshOutput
   m_EditorClassIdentifier: 
@@ -118,6 +122,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: c52d920e7fff73b498050a6b3c4404ca, type: 3}
   m_Name: VFXSlotUint
   m_EditorClassIdentifier: 
@@ -152,6 +157,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
   m_Name: VFXSlotTexture2D
   m_EditorClassIdentifier: 
@@ -192,6 +198,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f44f205d2606d1a4a91cfa6aa5ca9d87, type: 3}
   m_Name: VFXDataMesh
   m_EditorClassIdentifier: 
@@ -357,6 +364,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 3e3f628d80ffceb489beac74258f9cf7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -394,6 +402,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -436,6 +445,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -469,6 +479,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -502,6 +513,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -535,6 +547,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -583,6 +596,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -616,6 +630,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -649,6 +664,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -682,6 +698,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -724,6 +741,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -757,6 +775,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -790,6 +809,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
diff --git a/package/Editor/Templates/Simple Swarm Particle System.vfx b/package/Editor/Templates/Simple Swarm Particle System.vfx
index 97c6c4660..5adefb3fd 100755
--- a/package/Editor/Templates/Simple Swarm Particle System.vfx	
+++ b/package/Editor/Templates/Simple Swarm Particle System.vfx	
@@ -9,6 +9,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -55,6 +56,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -88,6 +90,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 2dc095764ededfa4bb32fa602511ea4b, type: 3}
   m_Name: VFXBasicUpdate
   m_EditorClassIdentifier: 
@@ -122,6 +125,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 70a331b1d86cc8d4aa106ccbe0da5852, type: 3}
   m_Name: VFXSlotTexture2D
   m_EditorClassIdentifier: 
@@ -156,6 +160,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d16c6aeaef944094b9a1633041804207, type: 3}
   m_Name: Orient
   m_EditorClassIdentifier: 
@@ -177,6 +182,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a0b9e6b9139e58d4c957ec54595da7d3, type: 3}
   m_Name: VFXQuadOutput
   m_EditorClassIdentifier: 
@@ -222,6 +228,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d78581a96eae8bf4398c282eb0b098bd, type: 3}
   m_Name: VFXDataParticle
   m_EditorClassIdentifier: 
@@ -246,6 +253,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 1b605c022ee79394a8a776c0869b3f9a, type: 3}
   m_Name: VFXSlot
   m_EditorClassIdentifier: 
@@ -282,6 +290,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -321,6 +330,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -372,6 +382,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -405,6 +416,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: b5ef41639278ae84eac41b1850137685, type: 3}
   m_Name: VectorFieldForce
   m_EditorClassIdentifier: 
@@ -433,6 +445,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -467,6 +480,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -509,6 +523,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: d01270efd3285ea4a9d6c555cb0a8027, type: 3}
   m_Name: VFXUI
   m_EditorClassIdentifier: 
@@ -531,6 +546,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ef9ecf819143d0a439c558ab8e84fce7, type: 3}
   m_Name: VFXSlotTexture3D
   m_EditorClassIdentifier: 
@@ -571,6 +587,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -604,6 +621,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -637,6 +655,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 1b605c022ee79394a8a776c0869b3f9a, type: 3}
   m_Name: VFXSlot
   m_EditorClassIdentifier: 
@@ -679,6 +698,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -712,6 +732,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 7d4c867f6b72b714dbb5fd1780afe208, type: 3}
   m_Name: Simple Swarm Particle System
   m_EditorClassIdentifier: 
@@ -737,6 +758,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -770,6 +792,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -812,6 +835,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -845,6 +869,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -878,6 +903,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 956b68870e880b144bab17e5aa6e7e94, type: 3}
   m_Name: ColorOverLife
   m_EditorClassIdentifier: 
@@ -902,6 +928,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a971fa2e110a0ac42ac1d8dae408704b, type: 3}
   m_Name: SetAttribute
   m_EditorClassIdentifier: 
@@ -928,6 +955,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a971fa2e110a0ac42ac1d8dae408704b, type: 3}
   m_Name: SetAttribute
   m_EditorClassIdentifier: 
@@ -955,6 +983,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f05c6884b705ce14d82ae720f0ec209f, type: 3}
   m_Name: VFXSpawnerConstantRate
   m_EditorClassIdentifier: 
@@ -976,6 +1005,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 73a13919d81fb7444849bae8b5c812a2, type: 3}
   m_Name: VFXBasicSpawner
   m_EditorClassIdentifier: 
@@ -1005,6 +1035,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -1045,6 +1076,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: VFXSlotFloat3
   m_EditorClassIdentifier: 
@@ -1087,6 +1119,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 1b605c022ee79394a8a776c0869b3f9a, type: 3}
   m_Name: VFXSlot
   m_EditorClassIdentifier: 
@@ -1122,6 +1155,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -1155,6 +1189,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 76f778ff57c4e8145b9681fe3268d8e9, type: 3}
   m_Name: VFXSlotGradient
   m_EditorClassIdentifier: 
@@ -1195,6 +1230,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 47b4ca114d6538548942a32238cf630d, type: 3}
   m_Name: PositionSphere
   m_EditorClassIdentifier: 
@@ -1218,6 +1254,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 9dfea48843f53fc438eabc12a3a30abc, type: 3}
   m_Name: VFXBasicInitialize
   m_EditorClassIdentifier: 
@@ -1250,6 +1287,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: VFXSlotFloat
   m_EditorClassIdentifier: 
@@ -1439,7 +1477,7 @@ VisualEffectResource:
       deadListCount;\n\t\t#endif\n\t\t\n\t\tCBUFFER_START(outputParams)\n\t\t\tfloat
       nbMax;\n\t\t\tfloat systemSeed;\n\t\tCBUFFER_END\n\t\t\n\t\tENDHLSL\n\t\t\n\n\t\t\n\t\t//
       Forward pass\n\t\tPass\n\t\t{\t\t\n\t\t\tTags { \"LightMode\"=\"ForwardOnly\"
-      }\n\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma target 4.5\n\t\t\t\n\t\t\n\t\t\tstruct
+      }\n\t\t\t\n\t\t\tHLSLPROGRAM\n\t\t\t#pragma target 4.5\n\t\t\t\t\n\t\t\tstruct
       ps_input\n\t\t\t{\n\t\t\t\tfloat4 pos : SV_POSITION;\n\t\t\t\t#if USE_FLIPBOOK_INTERPOLATION\n\t\t\t\tfloat4
       uv : TEXCOORD0;\n\t\t\t\t#else\n\t\t\t\tfloat2 uv : TEXCOORD0;\t\n\t\t\t\t#endif\n\t\t\t\t#if
       VFX_NEEDS_COLOR_INTERPOLATOR\n\t\t\t\tnointerpolation float4 color : COLOR0;\n\t\t\t\t#endif\n\t\t\t\t#if
@@ -1521,11 +1559,11 @@ VisualEffectResource:
       *= scaleY;\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t#if VFX_USE_SCALEZ_CURRENT\n\t\t\t\t\t\tsize3.z
       *= scaleZ;\n\t\t\t\t\t\t#endif\n\t\t\t\t\t\t\n\t\t\t\t\n\t\t\t\tconst float2
       vOffsets = o.VFX_VARYING_UV.xy - 0.5f;\n\t\t\t\tconst float4x4 elementToVFX
-      = GetElementToVFXMatrix(axisX,axisY,axisZ,float3(angleX,angleY,angleZ),float3(pivotX,pivotY,pivotZ),size3,position);\n\t\t\t\t\t
-      \ float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;\n\t\t\t\n\t\t\t\to.VFX_VARYING_POSCS
-      = TransformPositionVFXToClip(vPos);\n\t\t\t\n\t\t\t\tfloat3 normalWS = normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));\n\t\t\t\t#ifdef
-      VFX_VARYING_NORMAL\n\t\t\t\tfloat normalFlip = (size3.x * size3.y * size3.z)
-      < 0 ? -1 : 1;\n\t\t\t\to.VFX_VARYING_NORMAL = normalFlip * normalWS;\n\t\t\t\t#endif\n\t\t\t\t#ifdef
+      = GetElementToVFXMatrix(axisX,axisY,axisZ,float3(angleX,angleY,angleZ),float3(pivotX,pivotY,pivotZ),size3,position);\n\t\t\t\tconst
+      float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;\n\t\t\t\n\t\t\t\to.VFX_VARYING_POSCS
+      = TransformPositionVFXToClip(vPos);\n\t\t\t\t\n\t\t\t\t#ifdef VFX_VARYING_NORMAL\n\t\t\t\tfloat
+      normalFlip = (size3.x * size3.y * size3.z) < 0 ? -1 : 1;\n\t\t\t\to.VFX_VARYING_NORMAL
+      = normalFlip * normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));\n\t\t\t\t#endif\n\t\t\t\t#ifdef
       VFX_VARYING_TANGENT\n\t\t\t\to.VFX_VARYING_TANGENT = normalize(TransformDirectionVFXToWorld(normalize(transpose(elementToVFX)[0].xyz)));\n\t\t\t\t#endif\n\t\t\t\t#ifdef
       VFX_VARYING_BENTFACTORS\n\t\t\t\t\n\t\t\t\to.VFX_VARYING_BENTFACTORS = vOffsets
       * bentNormalFactor;\n\t\t\t\t#endif\n\t\t\t\n\t\t\t\t\n\t\t\t\t\t\t#if VFX_USE_COLOR_CURRENT
@@ -2039,6 +2077,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: 01ec2c1930009b04ea08905b47262415, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2067,6 +2106,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a4dabe497818b98468b0ebebf7de6583, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2110,6 +2150,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2152,6 +2193,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2185,6 +2227,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2218,6 +2261,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2251,6 +2295,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2299,6 +2344,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2332,6 +2378,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2365,6 +2412,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2398,6 +2446,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: ac39bd03fca81b849929b9c966f1836a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2440,6 +2489,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2473,6 +2523,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2506,6 +2557,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2539,6 +2591,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2586,6 +2639,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: c117b74c5c58db542bffe25c78fe92db, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2620,6 +2674,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2654,6 +2709,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: a971fa2e110a0ac42ac1d8dae408704b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -2680,6 +2736,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
+  m_GeneratorAsset: {fileID: 0}
   m_Script: {fileID: 11500000, guid: f780aa281814f9842a7c076d436932e7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
diff --git a/package/Editor/Types/VFXTypes.cs b/package/Editor/Types/VFXTypes.cs
index 54d1fe628..5197db290 100755
--- a/package/Editor/Types/VFXTypes.cs
+++ b/package/Editor/Types/VFXTypes.cs
@@ -295,10 +295,6 @@ struct CameraType
         public float aspectRatio;
         [Min(0.0f), Tooltip("The width and height of the camera in pixels.")]
         public Vector2 pixelDimensions;
-        [Tooltip("The depth buffer of the camera")]
-        public Texture2D depthBuffer;
-        [Tooltip("The color buffer of the camera")]
-        public Texture2D colorBuffer;
 
         public static CameraType defaultValue = new CameraType { transform = Transform.defaultValue, fieldOfView = 60.0f * Mathf.Deg2Rad, nearPlane = 0.3f, farPlane = 1000.0f, aspectRatio = 1.0f, pixelDimensions = new Vector2(1920, 1080) };
     }
diff --git a/package/Editor/Utilities/ParameterBinding/VFXParameterBinderEditor.cs b/package/Editor/Utilities/ParameterBinding/VFXParameterBinderEditor.cs
index 76ec0f798..27edc2e00 100755
--- a/package/Editor/Utilities/ParameterBinding/VFXParameterBinderEditor.cs
+++ b/package/Editor/Utilities/ParameterBinding/VFXParameterBinderEditor.cs
@@ -21,19 +21,17 @@ public class VFXParameterBinderEditor : Editor
         SerializedProperty m_ExecuteInEditor;
 
         GenericMenu m_Menu;
-        VFXBinderEditor m_ElementEditor;
+        Editor m_ElementEditor;
 
         static readonly Color validColor = new Color(0.5f, 1.0f, 0.2f);
         static readonly Color invalidColor = new Color(1.0f, 0.5f, 0.2f);
-        static readonly Color errorColor = new Color(1.0f, 0.2f, 0.2f);
-
 
         static class Styles
         {
             public static GUIStyle labelStyle;
             static Styles()
             {
-                labelStyle = new GUIStyle(EditorStyles.label) { padding = new RectOffset(20, 0, 2, 0), richText = true};
+                labelStyle = new GUIStyle(EditorStyles.label) { padding = new RectOffset(20, 0, 2, 0) };
             }
         }
 
@@ -194,11 +192,7 @@ public void SelectElement(ReorderableList list)
         public void UpdateSelection(int selected)
         {
             if (selected >= 0)
-            {
-                Editor editor = null;
-                CreateCachedEditor(m_Elements.GetArrayElementAtIndex(selected).objectReferenceValue, typeof(VFXBinderEditor), ref editor);
-                m_ElementEditor = editor as VFXBinderEditor;
-            }
+                CreateCachedEditor(m_Elements.GetArrayElementAtIndex(selected).objectReferenceValue, typeof(Editor), ref m_ElementEditor);
             else
                 m_ElementEditor = null;
         }
@@ -211,42 +205,24 @@ public void AddElement(ReorderableList list)
         public void DrawElement(Rect rect, int index, bool isActive, bool isFocused)
         {
             var target = m_Elements.GetArrayElementAtIndex(index).objectReferenceValue as VFXBinderBase;
-            Rect iconRect = new Rect(rect.xMin + 4, rect.yMin + 4, 8, 8);
-
-            if (target != null)
-            {
-                var element = target.ToString();
-
-                GUI.Label(rect, new GUIContent(element), Styles.labelStyle);
+            var element = target.ToString();
 
-                var component = (m_Component.objectReferenceValue as VisualEffect);
-                bool valid = target.IsValid(component);
+            GUI.Label(rect, new GUIContent(element), Styles.labelStyle);
 
+            var component = (m_Component.objectReferenceValue as VisualEffect);
+            bool valid = target.IsValid(component);
 
-                EditorGUI.DrawRect(iconRect, valid ? validColor : invalidColor);
-            }
-            else
-            {
-                EditorGUI.DrawRect(iconRect, errorColor);
-                GUI.Label(rect, "<color=red>(Missing or Null Parameter Binder)</color>", Styles.labelStyle);
-            }
-
+            Rect iconRect = new Rect(rect.xMin + 4, rect.yMin + 4, 8, 8);
+            EditorGUI.DrawRect(iconRect, valid ? validColor : invalidColor);
         }
 
         public void RemoveElement(ReorderableList list)
         {
             int index = m_List.index;
             var element = m_Elements.GetArrayElementAtIndex(index).objectReferenceValue;
-            if(element != null)
-            {
-                Undo.DestroyObjectImmediate(element);
-                m_Elements.DeleteArrayElementAtIndex(index); // Delete object reference
-            }
-            else
-            {
-                Undo.RecordObject(serializedObject.targetObject, "Remove null entry");
-            }
-            m_Elements.DeleteArrayElementAtIndex(index); // Remove list entry
+            Undo.DestroyObjectImmediate(element);
+            m_Elements.DeleteArrayElementAtIndex(index);
+            m_Elements.DeleteArrayElementAtIndex(index);
             UpdateSelection(-1);
         }
 
diff --git a/package/Editor/VisualElementExtensions.cs b/package/Editor/VisualElementExtensions.cs
index 404c96c99..e7cd84c37 100755
--- a/package/Editor/VisualElementExtensions.cs
+++ b/package/Editor/VisualElementExtensions.cs
@@ -28,6 +28,12 @@ public static GUIView  InternalGetGUIView(this IPanel panel)
         return (GUIView)m_OwnerPropertyInfo.GetValue(panel, new object[] {});
     }
 
+    // HasFocus on textField should really see if the child TextInput hasFocus
+    public static bool HasFocus<T>(this TextInputBaseField<T> texInput)
+    {
+        return ((VisualElement)texInput.Query(TextInputBaseField<T>.textInputUssName)).HasFocus();
+    }
+
     public static bool HasFocus(this VisualElement visualElement)
     {
         if (visualElement.panel == null) return false;
@@ -79,7 +85,13 @@ public static Vector2 GlobalToBound(this VisualElement visualElement, Vector2 po
 
     public static Vector2 BoundToGlobal(this VisualElement visualElement, Vector2 position)
     {
+        /*do
+        {*/
         position = visualElement.worldTransform.MultiplyPoint3x4(position);
+        /*
+        visualElement = visualElement.parent;
+    }
+    while (visualElement != null;)*/
 
         return position;
     }
diff --git a/package/Runtime/Utilities/ParameterBinding/VFXParameterBinder.cs b/package/Runtime/Utilities/ParameterBinding/VFXParameterBinder.cs
index 2c0639605..ee2c7c3a8 100755
--- a/package/Runtime/Utilities/ParameterBinding/VFXParameterBinder.cs
+++ b/package/Runtime/Utilities/ParameterBinding/VFXParameterBinder.cs
@@ -33,21 +33,8 @@ void Update()
         {
             if (!m_ExecuteInEditor && Application.isEditor && !Application.isPlaying) return;
 
-            for (int i = 0; i < m_Bindings.Count; i++ )
-            {
-                var binding = m_Bindings[i];
-
-                if(binding == null)
-                {
-                    Debug.LogWarning(string.Format("Parameter binder at index {0} of GameObject {1} is null or missing", i, gameObject.name));
-                    continue;
-                }
-                else
-                {
-                    if (binding.IsValid(m_VisualEffect))
-                        binding.UpdateBinding(m_VisualEffect);
-                }
-            }
+            foreach (var binding in m_Bindings)
+                if (binding.IsValid(m_VisualEffect)) binding.UpdateBinding(m_VisualEffect);
         }
 
         public T AddParameterBinder<T>() where T : VFXBinderBase
diff --git a/package/Shaders/ParticleDecals/PassForward.template b/package/Shaders/ParticleDecals/PassForward.template
index 6b68f9451..ca5a30535 100755
--- a/package/Shaders/ParticleDecals/PassForward.template
+++ b/package/Shaders/ParticleDecals/PassForward.template
@@ -7,7 +7,6 @@ Pass
 	
 	HLSLPROGRAM
 	#pragma target 4.5
-	${VFXPassForwardAdditionalPragma}
 		
 	struct ps_input
 	{
diff --git a/package/Shaders/ParticleHexahedron/PassBasicForward.template b/package/Shaders/ParticleHexahedron/PassBasicForward.template
index 6988df48d..46784399e 100755
--- a/package/Shaders/ParticleHexahedron/PassBasicForward.template
+++ b/package/Shaders/ParticleHexahedron/PassBasicForward.template
@@ -5,7 +5,6 @@ Pass
 	
 	HLSLPROGRAM
 	#pragma target 4.5
-	${VFXPassForwardAdditionalPragma}
 	
 	struct ps_input
 	{
diff --git a/package/Shaders/ParticleHexahedron/PassShadowCaster.template b/package/Shaders/ParticleHexahedron/PassShadowCaster.template
index 623cbea44..89109b37b 100755
--- a/package/Shaders/ParticleHexahedron/PassShadowCaster.template
+++ b/package/Shaders/ParticleHexahedron/PassShadowCaster.template
@@ -33,7 +33,7 @@ Pass
 #define VFX_VARYING_FACEID faceID
 		
 ${VFXBegin:VFXVertexAdditionalProcess}
-VFXApplyShadowBias(o.VFX_VARYING_POSCS, vPosWS);
+o.pos = VFXApplyShadowBias(o.pos);
 ${VFXEnd}
 
 // Needed for HDRP
@@ -51,4 +51,4 @@ ${VFXEnd}
 		return 0;
 	}
 	ENDHLSL
-}
+}
\ No newline at end of file
diff --git a/package/Shaders/ParticleLines/PassForward.template b/package/Shaders/ParticleLines/PassForward.template
index 3aff65517..564794353 100755
--- a/package/Shaders/ParticleLines/PassForward.template
+++ b/package/Shaders/ParticleLines/PassForward.template
@@ -5,7 +5,6 @@ Pass
 
 	HLSLPROGRAM
 	#pragma target 4.5
-	${VFXPassForwardAdditionalPragma}
 	
 	struct ps_input
 	{
diff --git a/package/Shaders/ParticleLines/PassShadowCaster.template b/package/Shaders/ParticleLines/PassShadowCaster.template
index 511bb7fb3..79fd40536 100755
--- a/package/Shaders/ParticleLines/PassShadowCaster.template
+++ b/package/Shaders/ParticleLines/PassShadowCaster.template
@@ -23,8 +23,7 @@ Pass
 #define VFX_VARYING_ALPHATHRESHOLD builtInInterpolants.x
 		
 ${VFXBegin:VFXVertexAdditionalProcess}
-float3 posWS = TransformPositionVFXToWorld(vPos);
-VFXApplyShadowBias(o.VFX_VARYING_POSCS, posWS);
+o.pos = VFXApplyShadowBias(o.pos);
 ${VFXEnd}
 
 // Needed for HDRP
diff --git a/package/Shaders/ParticleLinesSW/PassForward.template b/package/Shaders/ParticleLinesSW/PassForward.template
index d5231063b..acaf16339 100755
--- a/package/Shaders/ParticleLinesSW/PassForward.template
+++ b/package/Shaders/ParticleLinesSW/PassForward.template
@@ -5,7 +5,6 @@ Pass
 
 	HLSLPROGRAM
 	#pragma target 4.5
-	${VFXPassForwardAdditionalPragma}
 	
 	struct ps_input
 	{
diff --git a/package/Shaders/ParticleLinesSW/PassShadowCaster.template b/package/Shaders/ParticleLinesSW/PassShadowCaster.template
index e59a0ae86..a64ad2218 100755
--- a/package/Shaders/ParticleLinesSW/PassShadowCaster.template
+++ b/package/Shaders/ParticleLinesSW/PassShadowCaster.template
@@ -22,10 +22,9 @@ Pass
 #define VFX_VARYING_ALPHA builtInInterpolants.y
 #define VFX_VARYING_ALPHATHRESHOLD builtInInterpolants.x
 		
-${VFXBegin:VFXVertexAdditionalProcess}
-float3 posWS = TransformPositionVFXToWorld(vPos);
-VFXApplyShadowBias(o.VFX_VARYING_POSCS, posWS);
-${VFXEnd}
+	${VFXBegin:VFXVertexAdditionalProcess}
+		o.pos = VFXApplyShadowBias(o.pos);
+	${VFXEnd}
 	
 // Needed for HDRP
 #define SHADERPASS SHADERPASS_SHADOWS
diff --git a/package/Shaders/ParticleMeshes/Pass.template b/package/Shaders/ParticleMeshes/Pass.template
index 0c6d86297..57a4b67de 100755
--- a/package/Shaders/ParticleMeshes/Pass.template
+++ b/package/Shaders/ParticleMeshes/Pass.template
@@ -9,7 +9,9 @@ struct vs_input
 {
 	float3 pos : POSITION;
 	float2 uv : TEXCOORD0;
+	#ifdef VFX_VARYING_NORMAL
 	float3 normal : NORMAL;
+	#endif
 	#ifdef VFX_VARYING_TANGENT
 	float4 tangent : TANGENT;
 	#endif
@@ -35,9 +37,9 @@ VFX_VARYING_PS_INPUTS vert(vs_input i, uint instanceID : SV_InstanceID)
 	float3 vPos = mul(elementToVFX,float4(i.pos,1.0f)).xyz;
 
 	o.VFX_VARYING_POSCS = TransformPositionVFXToClip(vPos);
-	float3 normalWS = normalize(TransformDirectionVFXToWorld(mul((float3x3)elementToVFX, i.normal)));
+	
 	#ifdef VFX_VARYING_NORMAL // TODO Should use inverse transpose
-	o.VFX_VARYING_NORMAL = normalWS;
+	o.VFX_VARYING_NORMAL = normalize(TransformDirectionVFXToWorld(mul((float3x3)elementToVFX,i.normal)));
 	#endif
 	#ifdef VFX_VARYING_TANGENT
 	o.VFX_VARYING_TANGENT = float4(normalize(TransformDirectionVFXToWorld(mul((float3x3)elementToVFX,i.tangent.xyz))),i.tangent.w);
diff --git a/package/Shaders/ParticleMeshes/PassForward.template b/package/Shaders/ParticleMeshes/PassForward.template
index 0b8cdae03..0945fd53c 100755
--- a/package/Shaders/ParticleMeshes/PassForward.template
+++ b/package/Shaders/ParticleMeshes/PassForward.template
@@ -5,7 +5,6 @@ Pass
 	
 	HLSLPROGRAM
 	#pragma target 4.5
-	${VFXPassForwardAdditionalPragma}
 	
 	struct ps_input
 	{
diff --git a/package/Shaders/ParticleMeshes/PassShadowCaster.template b/package/Shaders/ParticleMeshes/PassShadowCaster.template
index 1959f8e08..55b3bfe90 100755
--- a/package/Shaders/ParticleMeshes/PassShadowCaster.template
+++ b/package/Shaders/ParticleMeshes/PassShadowCaster.template
@@ -32,10 +32,7 @@ Pass
 #define VFX_VARYING_FRAMEBLEND builtInInterpolants.y
 #define VFX_VARYING_UV uv
 		
-${VFXBegin:VFXVertexAdditionalProcess}
-float3 posWS = TransformPositionVFXToWorld(vPos);
-VFXApplyShadowBias(o.VFX_VARYING_POSCS, posWS, normalWS);
-${VFXEnd}
+${VFXBegin:VFXVertexAdditionalProcess}${VFXEnd}
 
 // Needed for HDRP
 #define SHADERPASS SHADERPASS_SHADOWS
diff --git a/package/Shaders/ParticlePoints/PassForward.template b/package/Shaders/ParticlePoints/PassForward.template
index e7d9d1993..14ccffe29 100755
--- a/package/Shaders/ParticlePoints/PassForward.template
+++ b/package/Shaders/ParticlePoints/PassForward.template
@@ -5,7 +5,6 @@ Pass
 
 	HLSLPROGRAM
 	#pragma target 4.5
-	${VFXPassForwardAdditionalPragma}
 	
 	struct ps_input
 	{
diff --git a/package/Shaders/ParticlePoints/PassShadowCaster.template b/package/Shaders/ParticlePoints/PassShadowCaster.template
index f9ad0b3fb..8ba58bf3f 100755
--- a/package/Shaders/ParticlePoints/PassShadowCaster.template
+++ b/package/Shaders/ParticlePoints/PassShadowCaster.template
@@ -23,8 +23,7 @@ Pass
 #define VFX_VARYING_ALPHATHRESHOLD builtInInterpolants.y
 	
 ${VFXBegin:VFXVertexAdditionalProcess}
-float3 posWS = TransformPositionVFXToWorld(vPos);
-VFXApplyShadowBias(o.VFX_VARYING_POSCS, posWS);
+o.pos = VFXApplyShadowBias(o.pos);
 ${VFXEnd}
 
 // Needed for HDRP
diff --git a/package/Shaders/ParticleQuads/PassForward.template b/package/Shaders/ParticleQuads/PassForward.template
index ec1d83ade..4ce9e0df7 100755
--- a/package/Shaders/ParticleQuads/PassForward.template
+++ b/package/Shaders/ParticleQuads/PassForward.template
@@ -5,8 +5,7 @@ Pass
 	
 	HLSLPROGRAM
 	#pragma target 4.5
-	${VFXPassForwardAdditionalPragma}
-
+		
 	struct ps_input
 	{
 		float4 pos : SV_POSITION;
diff --git a/package/Shaders/ParticleQuads/PassShadowCaster.template b/package/Shaders/ParticleQuads/PassShadowCaster.template
index 9a7252581..2619387ef 100755
--- a/package/Shaders/ParticleQuads/PassShadowCaster.template
+++ b/package/Shaders/ParticleQuads/PassShadowCaster.template
@@ -33,8 +33,7 @@ Pass
 #define VFX_VARYING_UV uv
 		
 ${VFXBegin:VFXVertexAdditionalProcess}
-float3 posWS = TransformPositionVFXToWorld(vPos);
-VFXApplyShadowBias(o.VFX_VARYING_POSCS, posWS, normalWS);
+o.pos = VFXApplyShadowBias(o.pos);
 ${VFXEnd}
 
 // Needed for HDRP
diff --git a/package/Shaders/ParticleQuads/PassVS.template b/package/Shaders/ParticleQuads/PassVS.template
index e689c96c8..f303d1d65 100755
--- a/package/Shaders/ParticleQuads/PassVS.template
+++ b/package/Shaders/ParticleQuads/PassVS.template
@@ -17,14 +17,13 @@ VFX_VARYING_PS_INPUTS vert(uint id : SV_VertexID, uint instanceID : SV_InstanceI
 	
 	const float2 vOffsets = o.VFX_VARYING_UV.xy - 0.5f;
 	const float4x4 elementToVFX = GetElementToVFXMatrix(axisX,axisY,axisZ,float3(angleX,angleY,angleZ),float3(pivotX,pivotY,pivotZ),size3,position);
-		  float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;
+	const float3 vPos = mul(elementToVFX,float4(vOffsets,0.0f,1.0f)).xyz;
 
 	o.VFX_VARYING_POSCS = TransformPositionVFXToClip(vPos);
-
-	float3 normalWS = normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));
+	
 	#ifdef VFX_VARYING_NORMAL
 	float normalFlip = (size3.x * size3.y * size3.z) < 0 ? -1 : 1;
-	o.VFX_VARYING_NORMAL = normalFlip * normalWS;
+	o.VFX_VARYING_NORMAL = normalFlip * normalize(TransformDirectionVFXToWorld(normalize(-transpose(elementToVFX)[2].xyz)));
 	#endif
 	#ifdef VFX_VARYING_TANGENT
 	o.VFX_VARYING_TANGENT = normalize(TransformDirectionVFXToWorld(normalize(transpose(elementToVFX)[0].xyz)));
diff --git a/package/Shaders/ParticleSpheres/PassShadowCaster.template b/package/Shaders/ParticleSpheres/PassShadowCaster.template
index 98bea7412..0d4682ad9 100755
--- a/package/Shaders/ParticleSpheres/PassShadowCaster.template
+++ b/package/Shaders/ParticleSpheres/PassShadowCaster.template
@@ -29,11 +29,6 @@ Pass
 #define VFX_VARYING_SPHERECENTER sphereInfo.xyz
 #define VFX_VARYING_SPHERERADIUS sphereInfo.w
 
-${VFXBegin:VFXVertexAdditionalProcess}
-float3 posWS = TransformPositionVFXToWorld(vPos);
-VFXApplyShadowBias(o.VFX_VARYING_POSCS, posWS);
-${VFXEnd}
-
 // Needed for HDRP
 #define SHADERPASS SHADERPASS_SHADOWS
 #define USE_LEGACY_UNITY_MATRIX_VARIABLES
diff --git a/package/Shaders/RenderPipeline/HDRP/VFXCommon.cginc b/package/Shaders/RenderPipeline/HDRP/VFXCommon.cginc
index b32a2affb..9c3cba19d 100755
--- a/package/Shaders/RenderPipeline/HDRP/VFXCommon.cginc
+++ b/package/Shaders/RenderPipeline/HDRP/VFXCommon.cginc
@@ -65,12 +65,9 @@ float VFXLinearEyeDepth(float depth)
     return LinearEyeDepth(depth,_ZBufferParams);
 }
 
-void VFXApplyShadowBias(inout float4 posCS, inout float3 posWS, float3 normalWS)
-{
-}
-
-void VFXApplyShadowBias(inout float4 posCS, inout float3 posWS)
+float4 VFXApplyShadowBias(float4 posCS)
 {
+    return posCS;
 }
 
 float4 VFXApplyFog(float4 color,float4 posCS,float3 posWS)
diff --git a/package/Shaders/RenderPipeline/HDRP/VFXLit.cginc b/package/Shaders/RenderPipeline/HDRP/VFXLit.cginc
index bb94d52c6..549998d3b 100755
--- a/package/Shaders/RenderPipeline/HDRP/VFXLit.cginc
+++ b/package/Shaders/RenderPipeline/HDRP/VFXLit.cginc
@@ -59,7 +59,7 @@ BuiltinData VFXGetBuiltinData(const VFX_VARYING_PS_INPUTS i,const PositionInputs
 {
     BuiltinData builtinData = (BuiltinData)0;
 
-    InitBuiltinData(posInputs, opacity, surfaceData.normalWS, -surfaceData.normalWS, (float4)0, (float4)0, builtinData); // We dont care about uvs are we dont sample lightmaps
+    InitBuiltinData(opacity, surfaceData.normalWS, -surfaceData.normalWS, posInputs.positionWS, (float4)0, (float4)0, builtinData); // We dont care about uvs are we dont sample lightmaps
 
     #if HDRP_USE_EMISSIVE
     builtinData.emissiveColor = float3(1,1,1);
diff --git a/package/Shaders/RenderPipeline/Legacy/VFXCommon.cginc b/package/Shaders/RenderPipeline/Legacy/VFXCommon.cginc
index b9b32fa78..716c298c5 100755
--- a/package/Shaders/RenderPipeline/Legacy/VFXCommon.cginc
+++ b/package/Shaders/RenderPipeline/Legacy/VFXCommon.cginc
@@ -59,16 +59,6 @@ float4 VFXApplyShadowBias(float4 posCS)
     return UnityApplyLinearShadowBias(posCS);
 }
 
-void VFXApplyShadowBias(inout float4 posCS, inout float3 posWS, float3 normalWS)
-{
-    posCS = UnityApplyLinearShadowBias(posCS);
-}
-
-void VFXApplyShadowBias(inout float4 posCS, inout float3 posWS)
-{
-    posCS = UnityApplyLinearShadowBias(posCS);
-}
-
 float4 VFXApplyFog(float4 color,float4 posSS,float3 posWS)
 {
     return color; // TODO
diff --git a/package/Shaders/VFXCommon.cginc b/package/Shaders/VFXCommon.cginc
index 62e05a549..8ec6e1068 100755
--- a/package/Shaders/VFXCommon.cginc
+++ b/package/Shaders/VFXCommon.cginc
@@ -74,37 +74,6 @@ float4 SampleTexture(VFXSampler2D s,float2 coords,float level = 0.0f)
     return s.t.SampleLevel(s.s,coords, level);
 }
 
-// Invert 3D transformation matrix (not perspective). Adapted from graphics gems 2.
-// Inverts upper left by calculating its determinant and multiplying it to the symmetric
-// adjust matrix of each element. Finally deals with the translation by transforming the
-// original translation using by the calculated inverse.
-//https://github.com/erich666/GraphicsGems/blob/master/gemsii/inverse.c
-float4x4 VFXInverseTRSMatrix(float4x4 input)
-{
-    float4x4 output = (float4x4)0;
-
-    //Fill output with cofactor
-    output._m00 = input._m11 * input._m22 - input._m21 * input._m12;
-    output._m01 = input._m21 * input._m02 - input._m01 * input._m22;
-    output._m02 = input._m01 * input._m12 - input._m11 * input._m02;
-    output._m10 = input._m20 * input._m12 - input._m10 * input._m22;
-    output._m11 = input._m00 * input._m22 - input._m20 * input._m02;
-    output._m12 = input._m10 * input._m02 - input._m00 * input._m12;
-    output._m20 = input._m10 * input._m21 - input._m20 * input._m11;
-    output._m21 = input._m20 * input._m01 - input._m00 * input._m21;
-    output._m22 = input._m00 * input._m11 - input._m10 * input._m01;
-
-    //Multiply by reciprocal determinant
-    float det = determinant((float3x3)input);
-    output *= rcp(det);
-
-    // Do the translation part
-    output._m03_m13_m23 = -mul((float3x3)output, input._m03_m13_m23);
-    output._m33 = 1.0f;
-
-    return output;
-}
-
 float4 SampleTexture(VFXSampler2DArray s,float2 coords,float slice,float level = 0.0f)
 {
     return s.t.SampleLevel(s.s,float3(coords,slice),level);
diff --git a/package/Shaders/VFXCommonOutput.cginc b/package/Shaders/VFXCommonOutput.cginc
index 3e203e5d2..1d8801bb6 100755
--- a/package/Shaders/VFXCommonOutput.cginc
+++ b/package/Shaders/VFXCommonOutput.cginc
@@ -99,13 +99,9 @@ void VFXClipFragmentColor(float alpha,VFX_VARYING_PS_INPUTS i)
 
 float4 VFXApplyFog(float4 color,VFX_VARYING_PS_INPUTS i)
 {
-    #if USE_FOG && defined(VFX_VARYING_POSCS)
-        #if defined(VFX_VARYING_POSWS)
-            return VFXApplyFog(color, i.VFX_VARYING_POSCS, i.VFX_VARYING_POSWS);
-        #else
-            return VFXApplyFog(color, i.VFX_VARYING_POSCS, (float3)0); //Some pipeline (LWRP) doesn't require WorldPos
-        #endif
+    #if USE_FOG && defined(VFX_VARYING_POSCS) && defined(VFX_VARYING_POSWS)
+    return VFXApplyFog(color,i.VFX_VARYING_POSCS,i.VFX_VARYING_POSWS);
     #else
-        return color;
+    return color;
     #endif
 }
diff --git a/package/package.json b/package/package.json
index 6ee75a79c..e4b451293 100755
--- a/package/package.json
+++ b/package/package.json
@@ -11,11 +11,10 @@
     "name": "com.unity.visualeffectgraph", 
     "repoPackagePath": "com.unity.visualeffectgraph", 
     "repository": {
-        "revision": "560092432e2d4ee2ee3cce04cbc45ebe702cda87", 
+        "revision": "b0c22f5873d72fe2c750ffcaff5a767895e01a4d", 
         "type": "git", 
         "url": "ssh://git@github.com/Unity-Technologies/ScriptableRenderLoop.git"
     }, 
-    "unity": "2019.1", 
-    "unityRelease": "0b6", 
-    "version": "5.8.2-preview"
+    "unity": "2019.2", 
+    "version": "6.5.2-preview"
 }
\ No newline at end of file
diff --git a/versions.txt b/versions.txt
index 2f9bcf24f..187793642 100755
--- a/versions.txt
+++ b/versions.txt
@@ -32,3 +32,4 @@
 5.8.0-preview
 5.8.1-preview
 5.8.2-preview
+6.5.2-preview