diff --git a/Scripts/AimerInputModule.cs b/Scripts/AimerInputModule.cs
index 10a62b9..2f00b8a 100644
--- a/Scripts/AimerInputModule.cs
+++ b/Scripts/AimerInputModule.cs
@@ -1,10 +1,6 @@
 /// Credit Chris Trueman
 /// Sourced from - http://forum.unity3d.com/threads/use-reticle-like-mouse-for-worldspace-uis.295271/
 
-using UnityEngine;
-using UnityEngine.EventSystems;
-using System.Collections.Generic;
-
 namespace UnityEngine.EventSystems.Extensions
 {
     [RequireComponent(typeof(EventSystem))]
diff --git a/Scripts/Editor/UIExtensionsMenuOptions.cs b/Scripts/Editor/UIExtensionsMenuOptions.cs
index 6faa789..79e1197 100644
--- a/Scripts/Editor/UIExtensionsMenuOptions.cs
+++ b/Scripts/Editor/UIExtensionsMenuOptions.cs
@@ -362,7 +362,8 @@ namespace UnityEditor.UI
             image.type = Image.Type.Sliced;
             image.color = s_DefaultSelectableColor;
 
-            UIButton bt = uiButtonRoot.AddComponent<UIButton>();
+            Button bt = uiButtonRoot.AddComponent<Button>();
+            uiButtonRoot.AddComponent<UISelectableExtension>();
             SetDefaultColorTransitionValues(bt);
 
             Text text = childText.AddComponent<Text>();
diff --git a/Scripts/UIButton.cs b/Scripts/UIButton.cs
deleted file mode 100644
index f912d6c..0000000
--- a/Scripts/UIButton.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-/// Credit AriathTheWise
-/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-2#post-1796783
-
-using UnityEngine.Events;
-using UnityEngine.EventSystems;
-
-namespace UnityEngine.UI.Extensions
-{
-    /// <summary>
-    /// UIButton
-    /// </summary>
-    [AddComponentMenu("UI/Extensions/UI Button")]
-    public class UIButton : Button, IPointerDownHandler, IPointerUpHandler
-    {
-        #region Sub-Classes
-        [System.Serializable]
-        public class UIButtonEvent : UnityEvent<PointerEventData.InputButton> { }
-        #endregion
-
-        #region Events
-        public UIButtonEvent OnButtonClick;
-        public UIButtonEvent OnButtonPress;
-        public UIButtonEvent OnButtonRelease;
-        #endregion
-
-        public override void OnPointerClick(PointerEventData eventData)
-        {
-            base.OnSubmit(eventData);
-
-            if (OnButtonClick != null)
-            {
-                OnButtonClick.Invoke(eventData.button);
-            }
-        }
-
-
-        void IPointerDownHandler.OnPointerDown(PointerEventData eventData)
-        {
-            DoStateTransition(SelectionState.Pressed, false);
-
-            if (OnButtonPress != null)
-            {
-                OnButtonPress.Invoke(eventData.button);
-            }
-        }
-
-
-        void IPointerUpHandler.OnPointerUp(PointerEventData eventData)
-        {
-            DoStateTransition(SelectionState.Normal, false);
-
-            if (OnButtonRelease != null)
-            {
-                OnButtonRelease.Invoke(eventData.button);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/Scripts/UILineRenderer.cs b/Scripts/UILineRenderer.cs
index c2d0369..e1b0700 100644
--- a/Scripts/UILineRenderer.cs
+++ b/Scripts/UILineRenderer.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 namespace UnityEngine.UI.Extensions
 {
  	[AddComponentMenu("UI/Extensions/UILineRenderer")]
-   public class UILineRenderer : Graphic
+   public class UILineRenderer : MaskableGraphic
     {
         [SerializeField]
         Texture m_Texture;
diff --git a/Scripts/UILineTextureRenderer.cs b/Scripts/UILineTextureRenderer.cs
index dcacf05..fbaaabd 100644
--- a/Scripts/UILineTextureRenderer.cs
+++ b/Scripts/UILineTextureRenderer.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
 namespace UnityEngine.UI.Extensions
 {
  	[AddComponentMenu("UI/Extensions/UILineTextureRenderer")]
-    public class UILineTextureRenderer : Graphic
+    public class UILineTextureRenderer : MaskableGraphic
     {
         [SerializeField]
         Texture m_Texture;
diff --git a/Scripts/UISelectableExtension.cs b/Scripts/UISelectableExtension.cs
new file mode 100644
index 0000000..0f73cf1
--- /dev/null
+++ b/Scripts/UISelectableExtension.cs
@@ -0,0 +1,112 @@
+/// Credit AriathTheWise
+/// Sourced from - http://forum.unity3d.com/threads/scripts-useful-4-6-scripts-collection.264161/page-2#post-1796783
+/// Extended to include a HELD state that continually fires while the button is held down.
+/// Refactored so it can be added to any button and expose the events in the editor.
+
+using UnityEngine.Events;
+using UnityEngine.EventSystems;
+
+namespace UnityEngine.UI.Extensions
+{
+    /// <summary>
+    /// UIButton
+    /// </summary>
+    [AddComponentMenu("UI/Extensions/UI Selectable Extension")]
+    [RequireComponent(typeof(Selectable))]
+    public class UISelectableExtension : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
+    {
+        #region Sub-Classes
+        [System.Serializable]
+        public class UIButtonEvent : UnityEvent<PointerEventData.InputButton> { }
+        #endregion
+
+        #region Events
+		[Tooltip("Event that fires when a button is initially pressed down")]
+        public UIButtonEvent OnButtonPress;
+		[Tooltip("Event that fires when a button is released")]
+        public UIButtonEvent OnButtonRelease;
+		[Tooltip("Event that continually fires while a button is held down")]
+        public UIButtonEvent OnButtonHeld;
+        #endregion
+		
+		private bool _pressed;
+        private PointerEventData _heldEventData;
+
+        void IPointerDownHandler.OnPointerDown(PointerEventData eventData)
+        {
+            //Can't set the state as it's too locked down.
+			//DoStateTransition(SelectionState.Pressed, false);
+
+            if (OnButtonPress != null)
+            {
+                OnButtonPress.Invoke(eventData.button);
+            }
+			_pressed = true;
+            _heldEventData = eventData;
+        }
+
+
+        void IPointerUpHandler.OnPointerUp(PointerEventData eventData)
+        {
+            //DoStateTransition(SelectionState.Normal, false);
+
+            if (OnButtonRelease != null)
+            {
+                OnButtonRelease.Invoke(eventData.button);
+            }
+ 			_pressed = false;
+            _heldEventData = null;
+       }
+	   
+	    void Update()
+		{
+			if (!_pressed)
+				return;
+			
+			if (OnButtonHeld != null)
+            {
+                OnButtonHeld.Invoke(_heldEventData.button);
+            }
+		}
+		
+		/// <summary>
+		/// Test method to verify a control has been clicked
+		/// </summary>
+		public void TestClicked()
+		{
+			#if DEBUG || UNITY_EDITOR
+				Debug.Log("Control Clicked");
+			#endif
+		}
+		
+		/// <summary>
+		/// Test method to verify a controll is pressed
+		/// </summary>
+		public void TestPressed()
+		{
+			#if DEBUG || UNITY_EDITOR
+				Debug.Log("Control Pressed");
+			#endif
+		}
+		
+		/// <summary>
+		/// est method to verify if a control is released
+		/// </summary>
+		public void TestReleased()
+		{
+			#if DEBUG || UNITY_EDITOR
+				Debug.Log("Control Released");
+			#endif
+		}
+		
+		/// <summary>
+		/// est method to verify if a control is being held
+		/// </summary>
+		public void TestHold()
+		{
+			#if DEBUG || UNITY_EDITOR
+				Debug.Log("Control Held");
+			#endif
+		}
+    }
+}
\ No newline at end of file
diff --git a/Scripts/UIButton.cs.meta b/Scripts/UISelectableExtension.cs.meta
similarity index 78%
rename from Scripts/UIButton.cs.meta
rename to Scripts/UISelectableExtension.cs.meta
index 8616646..da3ac74 100644
--- a/Scripts/UIButton.cs.meta
+++ b/Scripts/UISelectableExtension.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f2e459a0f758bc947ace4872e13f1da0
+guid: 6bb501adc62c7394fae41ae7a6032eb3
 MonoImporter:
   serializedVersion: 2
   defaultReferences: []