diff --git a/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs b/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs
index 184d2c8..e386d59 100644
--- a/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs
+++ b/FTSources/FTEditor/Sources/Editors/SwfManagerEditor.cs
@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEditor;
 
+using System.Linq;
 using System.Collections.Generic;
 
 using FTRuntime;
@@ -80,8 +81,8 @@ namespace FTEditor.Editors {
 		// ---------------------------------------------------------------------
 
 		void OnEnable() {
-			_manager = target as SwfManager;
-			_manager.GetAllControllers(_controllers);
+			_manager     = target as SwfManager;
+			_controllers = FindObjectsOfType<SwfClipController>().ToList();
 		}
 
 		public override void OnInspectorGUI() {
diff --git a/FTSources/FTRuntime/Sources/SwfClip.cs b/FTSources/FTRuntime/Sources/SwfClip.cs
index ea05d2d..5b06420 100644
--- a/FTSources/FTRuntime/Sources/SwfClip.cs
+++ b/FTSources/FTRuntime/Sources/SwfClip.cs
@@ -138,7 +138,7 @@ namespace FTRuntime {
 		//
 		// ---------------------------------------------------------------------
 
-		public void InternalLateUpdate() {
+		internal void InternalLateUpdate() {
 			if ( _meshFilter && _meshRenderer && _dirtyMesh ) {
 				var baked_frame = GetCurrentBakedFrame();
 				if ( baked_frame != null ) {
diff --git a/FTSources/FTRuntime/Sources/SwfManager.cs b/FTSources/FTRuntime/Sources/SwfManager.cs
index 02c7c18..64cce97 100644
--- a/FTSources/FTRuntime/Sources/SwfManager.cs
+++ b/FTSources/FTRuntime/Sources/SwfManager.cs
@@ -178,30 +178,26 @@ namespace FTRuntime {
 		//
 		// ---------------------------------------------------------------------
 
-		public void AddClip(SwfClip clip) {
+		internal void AddClip(SwfClip clip) {
 			_clips.Add(clip);
 		}
 
-		public void RemoveClip(SwfClip clip) {
+		internal void RemoveClip(SwfClip clip) {
 			_clips.Remove(clip);
 		}
 
-		public void GetAllClips(List<SwfClip> clips) {
+		internal void GetAllClips(List<SwfClip> clips) {
 			_clips.AssignTo(clips);
 		}
 
-		public void AddController(SwfClipController controller) {
+		internal void AddController(SwfClipController controller) {
 			_controllers.Add(controller);
 		}
 
-		public void RemoveController(SwfClipController controller) {
+		internal void RemoveController(SwfClipController controller) {
 			_controllers.Remove(controller);
 		}
 
-		public void GetAllControllers(List<SwfClipController> controllers) {
-			_controllers.AssignTo(controllers);
-		}
-
 		void GrabEnabledClips() {
 			var clips = FindObjectsOfType<SwfClip>();
 			for ( int i = 0, e = clips.Length; i < e; ++i ) {