diff --git a/UPGRADE b/UPGRADE
index f5a0fc1f..331f8402 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -95,6 +95,16 @@ OTHER CHANGES:
 	multi-line remote agent accounts. To enable, you must create Extension
 	Group entries and enable Extension Group in the Remote Agent entry.
 
+21. Added agi-AGENT_route.agi script to more easily allow for agentdirect calls
+	from call menus without having to create a DID entry for every agent.
+	Simply put this line in the custom dialplan section of the call menu
+	that you want to allow agentdirect dialing for:
+	   "exten => _XXXX,1,AGI(agi-AGENT_route.agi,default---AGENTDIRECT)"
+	That example will only work for agents that have 4-digit IDs.
+	This works well even after hours and when the agent is not available
+	because you can set the call to go to a voicemail box in the selected
+	in-group by using AGENTVMAIL in the voicemail field of the in-group.
+
 
 
 
diff --git a/agi/agi-AGENT_route.agi b/agi/agi-AGENT_route.agi
new file mode 100644
index 00000000..a3ac46b2
--- /dev/null
+++ b/agi/agi-AGENT_route.agi
@@ -0,0 +1,307 @@
+#!/usr/bin/perl
+#
+# agi-AGENT_route.agi version 2.4
+# 
+# for use with a Call Menu in the custom dialplan section.
+#
+# ; settings for this script:
+# ; 1. DID pattern to use for In-group initiation settings ('default' is default)
+# ; 2. the agentdirect in-group to send the calls to ('AGENTDIRECT' is default)
+#
+#; example with 4-digit agent IDs
+# exten => _XXXX,1,AGI(agi-AGENT_route.agi,default---AGENTDIRECT)
+#
+# Copyright (C) 2010  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+#
+# changes:
+# 100321-0108 - First Build
+#
+
+$script = 'agi-AGENT_route.agi';
+$S='*';
+$US='_';
+
+
+($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+$year = ($year + 1900);
+$mon++;
+if ($mon < 10) {$mon = "0$mon";}
+if ($mday < 10) {$mday = "0$mday";}
+if ($hour < 10) {$hour = "0$hour";}
+if ($min < 10) {$min = "0$min";}
+if ($sec < 10) {$sec = "0$sec";}
+
+$hm = "$hour$min";
+$hm = ($hm + 0);
+
+$now_date_epoch = time();
+$now_date = "$year-$mon-$mday $hour:$min:$sec";
+$CLInow_date = "$year-$mon-$mday\\ $hour:$min:$sec";
+$start_time=$now_date;
+$CIDdate = "$mon$mday$hour$min$sec";
+$tsSQLdate = "$year$mon$mday$hour$min$sec";
+$SQLdate = "$year-$mon-$mday $hour:$min:$sec";
+$SQLdateBEGIN = $SQLdate;
+
+# default path to astguiclient configuration file:
+$PATHconf =		'/etc/astguiclient.conf';
+
+open(conf, "$PATHconf") || die "can't open $PATHconf: $!\n";
+@conf = <conf>;
+close(conf);
+$i=0;
+foreach(@conf)
+	{
+	$line = $conf[$i];
+	$line =~ s/ |>|\n|\r|\t|\#.*|;.*//gi;
+	if ( ($line =~ /^PATHhome/) && ($CLIhome < 1) )
+		{$PATHhome = $line;   $PATHhome =~ s/.*=//gi;}
+	if ( ($line =~ /^PATHlogs/) && ($CLIlogs < 1) )
+		{$PATHlogs = $line;   $PATHlogs =~ s/.*=//gi;}
+	if ( ($line =~ /^PATHagi/) && ($CLIagi < 1) )
+		{$PATHagi = $line;   $PATHagi =~ s/.*=//gi;}
+	if ( ($line =~ /^PATHweb/) && ($CLIweb < 1) )
+		{$PATHweb = $line;   $PATHweb =~ s/.*=//gi;}
+	if ( ($line =~ /^PATHsounds/) && ($CLIsounds < 1) )
+		{$PATHsounds = $line;   $PATHsounds =~ s/.*=//gi;}
+	if ( ($line =~ /^PATHmonitor/) && ($CLImonitor < 1) )
+		{$PATHmonitor = $line;   $PATHmonitor =~ s/.*=//gi;}
+	if ( ($line =~ /^VARserver_ip/) && ($CLIserver_ip < 1) )
+		{$VARserver_ip = $line;   $VARserver_ip =~ s/.*=//gi;}
+	if ( ($line =~ /^VARDB_server/) && ($CLIDB_server < 1) )
+		{$VARDB_server = $line;   $VARDB_server =~ s/.*=//gi;}
+	if ( ($line =~ /^VARDB_database/) && ($CLIDB_database < 1) )
+		{$VARDB_database = $line;   $VARDB_database =~ s/.*=//gi;}
+	if ( ($line =~ /^VARDB_user/) && ($CLIDB_user < 1) )
+		{$VARDB_user = $line;   $VARDB_user =~ s/.*=//gi;}
+	if ( ($line =~ /^VARDB_pass/) && ($CLIDB_pass < 1) )
+		{$VARDB_pass = $line;   $VARDB_pass =~ s/.*=//gi;}
+	if ( ($line =~ /^VARDB_port/) && ($CLIDB_port < 1) )
+		{$VARDB_port = $line;   $VARDB_port =~ s/.*=//gi;}
+	$i++;
+	}
+
+if (!$VARDB_port) {$VARDB_port='3306';}
+if (!$AGILOGfile) {$AGILOGfile = "$PATHlogs/agiout.$year-$mon-$mday";}
+
+use DBI;
+use Time::HiRes ('gettimeofday','usleep','sleep');  # necessary to have perl sleep command of less than one second
+use Asterisk::AGI;
+$AGI = new Asterisk::AGI;
+
+$dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass")
+    or die "Couldn't connect to database: " . DBI->errstr;
+
+### Grab Server values from the database
+$stmtA = "SELECT agi_output,local_gmt FROM servers where server_ip = '$VARserver_ip';";
+$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
+$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
+$sthArows=$sthA->rows;
+if ($sthArows > 0)
+	{
+	$AGILOG = '0';
+	@aryA = $sthA->fetchrow_array;
+	$DBagi_output =		$aryA[0];
+	$local_gmt =		$aryA[1];
+	if ($DBagi_output =~ /STDERR/)	{$AGILOG = '1';}
+	if ($DBagi_output =~ /FILE/)	{$AGILOG = '2';}
+	if ($DBagi_output =~ /BOTH/)	{$AGILOG = '3';}
+	}
+$sthA->finish();
+
+### begin parsing run-time options ###
+if (length($ARGV[0])>1)
+	{
+	if ($AGILOG) {$agi_string = "Perl Environment Dump:";   &agi_output;}
+	$i=0;
+	while ($#ARGV >= $i)
+		{
+		$args = "$args $ARGV[$i]";
+		if ($AGILOG) {$agi_string = "$i|$ARGV[$i]";   &agi_output;}
+		$i++;
+		}
+	
+	### list of command-line array arguments:
+	@ARGV_vars = split(/---/, $ARGV[0]);
+
+	$did_settings = $ARGV_vars[0];
+	$in_group = 	$ARGV_vars[1];
+	}
+if (length($did_settings) < 1)
+	{$did_settings = 'default';}
+if (length($in_group) < 1)
+	{$in_group = 'AGENTDIRECT';}
+
+
+$|=1;
+while(<STDIN>) 
+	{
+	chomp;
+	last unless length($_);
+	if ($AGILOG)
+		{
+		if (/^agi_(\w+)\:\s+(.*)$/)
+			{
+			$AGI{$1} = $2;
+			}
+		}
+
+	if (/^agi_context\:\s+(.*)$/)		{$context = $1;}
+	if (/^agi_priority\:\s+(.*)$/)		{$priority = $1;}
+	if (/^agi_uniqueid\:\s+(.*)$/)		{$unique_id = $1; $uniqueid = $unique_id;}
+	if (/^agi_channel\:\s+(.*)$/)		{$channel = $1;}
+	if (/^agi_extension\:\s+(.*)$/)		{$extension = $1;}
+	if (/^agi_type\:\s+(.*)$/)			{$type = $1;}
+	if (/^agi_callerid\:\s+(.*)$/)		{$callerid = $1;}
+	if (/^agi_calleridname\:\s+(.*)$/)	{$calleridname = $1;}
+	}
+
+
+if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown/) ) )
+	{
+	$calleridname = $callerid;
+	$calleridname =~ s/\<\d\d\d\d\d\d\d\d\d\d\>//gi;
+	$calleridname =~ s/\"|\" //gi;
+	}
+
+$callerid =~ s/\D//gi;
+$calleridname =~ s/unknown//gi;
+if ( (!$callerid) or ($callerid =~ /unknown/) )
+	{$callerid = $calleridname;}
+
+
+### Grab DID values from the database
+$DIDs_in_system=0;
+$stmtA = "SELECT did_id FROM vicidial_inbound_dids where did_pattern = '$did_settings' and did_active='Y';";
+$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
+$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
+$sthArows=$sthA->rows;
+if ($sthArows > 0)
+	{
+	@aryA = $sthA->fetchrow_array;
+	$did_id =		$aryA[0];
+	$DIDs_in_system++;
+	}
+$sthA->finish();
+
+if ($sthArows < 1)
+	{
+	### Grab DID values from the database for a default DID pattern if there is one
+	$stmtA = "SELECT did_id FROM vicidial_inbound_dids where did_pattern = 'default' and did_active='Y';";
+	$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
+	$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
+	$DIDs_in_system=$sthA->rows;
+	if ($DIDs_in_system > 0)
+		{
+		@aryA = $sthA->fetchrow_array;
+		$did_id =						$aryA[0];
+		}
+	$sthA->finish();
+	}
+
+### Grab Server values from the database
+$cbc=0;
+$stmtA = "SELECT ext_context FROM servers where server_ip = '$VARserver_ip';";
+$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
+$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
+$sthArows=$sthA->rows;
+while ($sthArows > $cbc)
+	{
+	@aryA = $sthA->fetchrow_array;
+	$DBext_context		=			$aryA[0];
+	if ($DBext_context)				{$ext_context = $DBext_context;}
+	$cbc++;
+	}
+$sthA->finish();
+
+### find out if user exists and is active in system
+$active_user=0;
+$stmtA = "SELECT count(*) FROM vicidial_users where user='$extension' and active='Y';";
+$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
+$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
+$sthArows=$sthA->rows;
+if ($sthArows > 0)
+	{
+	@aryA = $sthA->fetchrow_array;
+	$active_user = $aryA[0];
+	}
+$sthA->finish();
+
+
+
+### Route call to a logged-in VICIDIAL agent
+if ($active_user > 0)
+	{
+	$did_extension = "99909$S$did_id$S$in_group$S$extension$S";
+	}
+else
+	{
+	$did_extension = "s";
+	$ext_context = $context;
+
+	$AGI->stream_file('sip-silence');
+	$AGI->stream_file('sip-silence');
+	$AGI->stream_file('invalid');
+	}
+
+
+if ($AGILOG) {$agi_string = "exiting the AGENT app, transferring call to $did_extension @ $ext_context";   &agi_output;}
+print "SET CONTEXT $ext_context\n";
+	checkresult($result);
+print "SET EXTENSION $did_extension\n";
+	checkresult($result);
+print "SET PRIORITY 1\n";
+	checkresult($result);
+
+exit;
+
+
+
+
+
+######### SUBROUTINES #################
+
+sub checkresult 
+	{
+	$pass=0;   $fail=0;
+	my ($res) = @_;
+	my $retval;
+	$tests++;
+	chomp $res;
+	if ($res =~ /^200/) 
+		{
+		$res =~ /result=(-?\d+)/;
+		if (!length($1)) 
+			{
+		#	print STDERR "FAIL ($res)\n";
+			$fail++;
+			} 
+		else 
+			{
+		#	print STDERR "PASS ($1)\n";
+			$pass++;
+			}
+		} 
+	else 
+		{
+	#	print STDERR "FAIL (unexpected result '$res')\n";
+		$fail++;
+		}
+	}
+
+sub agi_output
+	{
+	if ($AGILOG >=2)
+		{
+		### open the log file for writing ###
+		open(Lout, ">>$AGILOGfile")
+				|| die "Can't open $AGILOGfile: $!\n";
+		print Lout "$now_date|$script|$agi_string\n";
+		close(Lout);
+		}
+		### send to STDERR writing ###
+	if ( ($AGILOG == '1') || ($AGILOG == '3') )
+		{print STDERR "$now_date|$script|$agi_string\n";}
+	$agi_string='';
+	}
+
diff --git a/agi/agi-VDAD_ALL_inbound.agi b/agi/agi-VDAD_ALL_inbound.agi
index fdae0bdb..d0bfcc47 100644
--- a/agi/agi-VDAD_ALL_inbound.agi
+++ b/agi/agi-VDAD_ALL_inbound.agi
@@ -316,6 +316,7 @@ if ($extension =~ /^999\d\d\*/)
 	$referring_extension =	$EXT_vars[0];	# initial extension sent
 	$did_id =				$EXT_vars[1];	# the DID ID to grab settings from
 	$in_group_override = 	$EXT_vars[2];	# the in-group override, if set
+	$agentdirect_override = $EXT_vars[3];	# the agentdirect override, if set
 
 	### Grab DID values from the database
 	$stmtA = "SELECT call_handle_method,agent_search_method,group_id,did_pattern,list_id,phone_code,campaign_id,user,user_unavailable_action,user_route_settings_ingroup,did_route,voicemail_ext,extension,exten_context,phone,server_ip FROM vicidial_inbound_dids where did_id = '$did_id';";
@@ -349,6 +350,8 @@ if ($extension =~ /^999\d\d\*/)
 		}
 	$sthA->finish();
 
+	if (length($agentdirect_override) > 0) {$agent_only = $agentdirect_override;}
+
 	if (length($in_group_override) > 1) 
 		{
 		$igo_valid=0;
diff --git a/www/vicidial/AST_VICIDIAL_hopperlist.php b/www/vicidial/AST_VICIDIAL_hopperlist.php
index 8bc67cf3..559da5ab 100644
--- a/www/vicidial/AST_VICIDIAL_hopperlist.php
+++ b/www/vicidial/AST_VICIDIAL_hopperlist.php
@@ -79,7 +79,13 @@ while ($i < $campaigns_to_print)
 
 <?php 
 echo "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=utf-8\">\n";
-echo "<TITLE>Hopper List Report</TITLE></HEAD><BODY BGCOLOR=WHITE>\n";
+echo "<TITLE>Hopper List Report</TITLE></HEAD><BODY BGCOLOR=WHITE marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>\n";
+
+	$short_header=1;
+
+	require("admin_header.php");
+
+echo "<TABLE CELLPADDING=4 CELLSPACING=0><TR><TD>";
 echo "<FORM ACTION=\"$PHP_SELF\" METHOD=GET>\n";
 echo "<SELECT SIZE=1 NAME=group>\n";
 $o=0;
@@ -164,4 +170,6 @@ else
 ?>
 </PRE>
 
+</TD></TR></TABLE>
+
 </BODY></HTML>
diff --git a/www/vicidial/AST_VICIDIAL_ingrouplist.php b/www/vicidial/AST_VICIDIAL_ingrouplist.php
index db2a6060..328add27 100644
--- a/www/vicidial/AST_VICIDIAL_ingrouplist.php
+++ b/www/vicidial/AST_VICIDIAL_ingrouplist.php
@@ -74,7 +74,13 @@ while ($i < $ingroups_to_print)
 
 <?php 
 echo "<META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; charset=utf-8\">\n";
-echo "<TITLE>Live In-Group Agent Report</TITLE></HEAD><BODY BGCOLOR=WHITE>\n";
+echo "<TITLE>Live In-Group Agent Report</TITLE></HEAD><BODY BGCOLOR=WHITE marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>\n";
+
+	$short_header=1;
+
+	require("admin_header.php");
+
+echo "<TABLE CELLPADDING=4 CELLSPACING=0><TR><TD>";
 echo "<FORM ACTION=\"$PHP_SELF\" METHOD=GET>\n";
 echo "<SELECT SIZE=1 NAME=group>\n";
 $o=0;
@@ -158,4 +164,6 @@ else
 ?>
 </PRE>
 
+</TD></TR></TABLE>
+
 </BODY></HTML>