diff --git a/extensions.conf b/extensions.conf
index 7703c2c..5f73e1b 100644
--- a/extensions.conf
+++ b/extensions.conf
@@ -34,40 +34,38 @@ exten => i,1,Playback(silence/1&goodbye)
 exten => t,1,Goto(s,loop)
 
 exten => _X,1,NoOp()
-;same =>    n,Playback(silence/1&you-entered)
-;same =>    n,SayNumber(${EXTEN})
  same =>    n,Wait(1)
- same =>    n,Goto(${EXTEN},100)
+ same =>    n,GoSub(${EXTEN},100)
+ same =>    n,Wait(1)
+ same =>    n,Goto(s,loop)
 
 exten => 1,100,NoOp()
  same =>     n,Goto(extdn42whois,${CALLNUM},5)
- same =>     n,Goto(menuend,1)
+ same =>     n,Return()
 
 exten => 2,100,NoOp()
  same =>     n,ConfBridge(1,bridge1,user1,sample_user_menu)
- same =>     n,Goto(menuend,1)
+ same =>     n,Return()
 
 exten => 3,100,NoOp()
  same =>     n,Playback(your&number&is)
  same =>     n,SayAlpha(${CALLERID(num)})
  same =>     n,Playback(silence/1&calling)
  same =>     n,SayAlpha(${CALLNUM})
- same =>     n,Goto(menuend,1)
+ same =>     n,Return()
 
 exten => 4,100,NoOp()
  same =>     n,Read(TMPNOM,z-external,1,,1,0.1)
- same =>     n,Goto(menuend,1)
+ same =>     n,Return()
  
 exten => 5,100,NoOp()
  same =>     n,Read(TMPNOM,z-macroform-cold_day,1,,1,0.1)
- same =>     n,Goto(menuend,1)
+ same =>     n,Return()
 
 exten => _X,100,NoOp()
- same =>      n,Goto(menuend,1)
-
-exten => menuend,1,NoOp()
- same =>         n,Wait(1)
- same =>         n,Goto(s,loop)
+ same =>      n,Playback(silence/1&you-entered)
+ same =>      n,SayNumber(${EXTEN})
+ same =>      n,Return()
 
 [extmyself]
 exten => i,1,NoOp()