diff --git a/Assets/Cryville/Crtr/Chart.cs b/Assets/Cryville/Crtr/Chart.cs
index ab2d780..57fc3d2 100644
--- a/Assets/Cryville/Crtr/Chart.cs
+++ b/Assets/Cryville/Crtr/Chart.cs
@@ -377,14 +377,6 @@ namespace Cryville.Crtr {
 				}
 			}
 
-			public Note() {
-				SubmitPropSrc("track", new PropSrc.Float(() => {
-					var i = motions.FirstOrDefault(m => m.RelativeNode == null && m.Name == "track");
-					if (i == null) return ((Vec1)ChartPlayer.motionRegistry["track"].InitValue).Value;
-					else return ((Vec1)i.AbsoluteValue).Value;
-				}));
-			}
-
 			public override EventList GetEventsOfType(string type) {
 				switch (type) {
 					case "judges": return new EventList<Judge>(judges);
diff --git a/Assets/Cryville/Crtr/SkinContainer.cs b/Assets/Cryville/Crtr/SkinContainer.cs
index 8b6ae06..5112c36 100644
--- a/Assets/Cryville/Crtr/SkinContainer.cs
+++ b/Assets/Cryville/Crtr/SkinContainer.cs
@@ -29,7 +29,9 @@ namespace Cryville.Crtr {
 					else {
 						ChartPlayer.etor.ContextTransform = obj;
 						ChartPlayer.etor.ContextEvent = context.Container;
+						ChartPlayer.etor.ContextState = context;
 						ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
+						ChartPlayer.etor.ContextState = null;
 						ChartPlayer.etor.ContextEvent = null;
 						ChartPlayer.etor.ContextTransform = null;
 					}
@@ -58,7 +60,9 @@ namespace Cryville.Crtr {
 					if (p.Value.IsConstant) continue;
 					ChartPlayer.etor.ContextTransform = obj;
 					ChartPlayer.etor.ContextEvent = context.Container;
+					ChartPlayer.etor.ContextState = context;
 					ChartPlayer.etor.Evaluate(GetPropOp(obj, p.Key), p.Value);
+					ChartPlayer.etor.ContextState = null;
 					ChartPlayer.etor.ContextEvent = null;
 					ChartPlayer.etor.ContextTransform = null;
 				}
diff --git a/Assets/Cryville/Crtr/SkinSelectors.cs b/Assets/Cryville/Crtr/SkinSelectors.cs
index d2af7ca..7d9c92d 100644
--- a/Assets/Cryville/Crtr/SkinSelectors.cs
+++ b/Assets/Cryville/Crtr/SkinSelectors.cs
@@ -115,7 +115,9 @@ namespace Cryville.Crtr {
 			public override Transform Match(ContainerState h, Transform a, Transform ot = null) {
 				ChartPlayer.etor.ContextTransform = a;
 				ChartPlayer.etor.ContextEvent = h.Container;
+				ChartPlayer.etor.ContextState = h;
 				ChartPlayer.etor.Evaluate(_op, _exp);
+				ChartPlayer.etor.ContextState = null;
 				ChartPlayer.etor.ContextEvent = null;
 				ChartPlayer.etor.ContextTransform = null;
 				return _flag ? a : null;