diff --git a/reference/EventArgTarget/EventArgTarget.upp b/reference/EventArgTarget/EventArgTarget.upp
deleted file mode 100644
index cd968972e..000000000
--- a/reference/EventArgTarget/EventArgTarget.upp
+++ /dev/null
@@ -1,11 +0,0 @@
-description "\"value\" return callback for local MenuBar\377";
-
-uses
-	CtrlLib;
-
-file
-	main.cpp;
-
-mainconfig
-	"" = "GUI";
-
diff --git a/reference/EventArgTarget/init b/reference/EventArgTarget/init
deleted file mode 100644
index 2f58db064..000000000
--- a/reference/EventArgTarget/init
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _EventArgTarget_icpp_init_stub
-#define _EventArgTarget_icpp_init_stub
-#include "CtrlLib/init"
-#endif
diff --git a/reference/MenuBarValue/MenuBarValue.upp b/reference/MenuBarValue/MenuBarValue.upp
new file mode 100644
index 000000000..5c2dbc591
--- /dev/null
+++ b/reference/MenuBarValue/MenuBarValue.upp
@@ -0,0 +1,11 @@
+description "\"value\" return from local MenuBar\377";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/MenuBarValue/init b/reference/MenuBarValue/init
new file mode 100644
index 000000000..1c857ab05
--- /dev/null
+++ b/reference/MenuBarValue/init
@@ -0,0 +1,4 @@
+#ifndef _MenuBarValue_icpp_init_stub
+#define _MenuBarValue_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/EventArgTarget/main.cpp b/reference/MenuBarValue/main.cpp
similarity index 78%
rename from reference/EventArgTarget/main.cpp
rename to reference/MenuBarValue/main.cpp
index e1535b07b..167561c07 100644
--- a/reference/EventArgTarget/main.cpp
+++ b/reference/MenuBarValue/main.cpp
@@ -4,10 +4,10 @@ using namespace Upp;
 
 struct MyApp : TopWindow {
 	virtual void RightDown(Point p, dword keyflags) {
-		EventArgTarget<int> result;
+		int result = Null;
 		MenuBar menu;
 		for(int i = 0; i < 10; i++)
-			menu.Add(AsString(i), result[i]);
+			menu.Add(AsString(i), [=, &result] { result = i; });
 		menu.Execute();
 		if(IsNull(result))
 			PromptOK("Menu was cancelled");
diff --git a/reference/PromptRedirect/init b/reference/PromptRedirect/init
new file mode 100644
index 000000000..952553207
--- /dev/null
+++ b/reference/PromptRedirect/init
@@ -0,0 +1,4 @@
+#ifndef _PromptRedirect_icpp_init_stub
+#define _PromptRedirect_icpp_init_stub
+#include "CtrlLib/init"
+#endif
diff --git a/reference/PromptRedirect/main.cpp b/reference/PromptRedirect/main.cpp
index f98a6cb0f..4b590caf4 100644
--- a/reference/PromptRedirect/main.cpp
+++ b/reference/PromptRedirect/main.cpp
@@ -2,7 +2,7 @@
 
 using namespace Upp;
 
-int MyPrompt(Callback1<const String&> WhenLink,
+int MyPrompt(Event<const String&> WhenLink,
              const char *title, const Image& iconbmp, const char *qtf, bool okcancel,
              const char *button1, const char *button2, const char *button3,
              int cx, Image im1, Image im2, Image im3)