diff --git a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java
index 427a075..d9c6339 100644
--- a/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java
+++ b/src/main/java/com/toofifty/easygiantsfoundry/EasyGiantsFoundryPlugin.java
@@ -19,17 +19,7 @@ import net.runelite.api.Item;
 import net.runelite.api.ItemContainer;
 import net.runelite.api.MenuAction;
 import net.runelite.api.Skill;
-import net.runelite.api.events.GameObjectDespawned;
-import net.runelite.api.events.GameObjectSpawned;
-import net.runelite.api.events.GameStateChanged;
-import net.runelite.api.events.GameTick;
-import net.runelite.api.events.ItemContainerChanged;
-import net.runelite.api.events.MenuOptionClicked;
-import net.runelite.api.events.NpcDespawned;
-import net.runelite.api.events.NpcSpawned;
-import net.runelite.api.events.ScriptPostFired;
-import net.runelite.api.events.StatChanged;
-import net.runelite.api.events.VarbitChanged;
+import net.runelite.api.events.*;
 import net.runelite.api.widgets.Widget;
 import net.runelite.client.Notifier;
 import net.runelite.client.callback.ClientThread;
@@ -277,6 +267,15 @@ public class EasyGiantsFoundryPlugin extends Plugin
 		}
 	}
 
+	public void onMenuEntryAdded(MenuEntryAdded event)
+	{
+		if (event.getOption().startsWith("Heat-preform") || event.getOption().startsWith("Dunk-preform"))
+		{
+		}
+		else if (event.getOption().startsWith("Cool-preform") || event.getOption().startsWith("Quench-preform")) {
+		}
+	}
+
 	@Subscribe
 	public void onMenuOptionClicked(MenuOptionClicked event)
 	{
@@ -285,7 +284,9 @@ public class EasyGiantsFoundryPlugin extends Plugin
 			|| event.getMenuAction() == MenuAction.GAME_OBJECT_SECOND_OPTION
 			|| event.getMenuAction() == MenuAction.GAME_OBJECT_THIRD_OPTION
 			|| event.getMenuAction() == MenuAction.GAME_OBJECT_FOURTH_OPTION
-			|| event.getMenuAction() == MenuAction.GAME_OBJECT_FIFTH_OPTION))
+			|| event.getMenuAction() == MenuAction.GAME_OBJECT_FIFTH_OPTION
+			|| event.getMenuAction() == MenuAction.WIDGET_TARGET_ON_GAME_OBJECT
+			|| event.getMenuAction() == MenuAction.WALK))
 		{
 			return;
 		}
diff --git a/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java b/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java
index 263041a..6cb3554 100644
--- a/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java
+++ b/src/main/java/com/toofifty/easygiantsfoundry/FoundryOverlay3D.java
@@ -16,6 +16,7 @@ import javax.inject.Inject;
 
 import net.runelite.api.Client;
 import net.runelite.api.GameObject;
+import net.runelite.api.MenuEntry;
 import net.runelite.api.NPC;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -166,6 +167,23 @@ public class FoundryOverlay3D extends Overlay
 		{
 			drawHeatChangers(graphics);
 		}
+		else
+		{
+			MenuEntry[] menuEntries = client.getMenuEntries();
+			if (menuEntries.length != 0)
+			{
+				MenuEntry hoveredMenu = menuEntries[menuEntries.length - 1];
+
+				if (hoveredMenu.getIdentifier() == lavaPool.getId())
+				{
+					drawHeatChangerPreviewOverlay(graphics, lavaPool, true);
+				}
+				else if (hoveredMenu.getIdentifier() == waterfall.getId())
+				{
+					drawHeatChangerPreviewOverlay(graphics, waterfall, false);
+				}
+			}
+		}
 
 		return null;
 	}