diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh
index 6a96b5ff9..05353ae14 100755
--- a/Shorewall-common/fallback.sh
+++ b/Shorewall-common/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh
index 0b590806a..76ac7eac8 100755
--- a/Shorewall-common/install.sh
+++ b/Shorewall-common/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-common/shorewall.spec b/Shorewall-common/shorewall.spec
index 4f5d48563..a032f48f3 100644
--- a/Shorewall-common/shorewall.spec
+++ b/Shorewall-common/shorewall.spec
@@ -1,6 +1,6 @@
 %define name shorewall
-%define version 3.9.7
-%define release 1
+%define version 4.0.0
+%define release 0Beta1
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -252,6 +252,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
 
 %changelog
+* Tue May 15 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta1
 * Fri May 11 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.7-1
 * Sat May 05 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh
index c29da747e..5e97ed004 100755
--- a/Shorewall-common/uninstall.sh
+++ b/Shorewall-common/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh
index dd4093bec..ca079e059 100755
--- a/Shorewall-lite/fallback.sh
+++ b/Shorewall-lite/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index ec04ef721..96f8c2dd5 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 22b549d82..b5a9dc141 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -1,6 +1,6 @@
 %define name shorewall-lite
-%define version 3.9.7
-%define release 1
+%define version 4.0.0
+%define release 0Beta1
 %define prefix /usr
 
 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@@ -99,6 +99,8 @@ fi
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
+* Tue May 15 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta1
 * Fri May 11 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.7-1
 * Sat May 05 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh
index 8355e0323..f48a0b744 100755
--- a/Shorewall-lite/uninstall.sh
+++ b/Shorewall-lite/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Shorewall Firewall
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 92e0fa92d..57fcc011e 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -72,7 +72,7 @@ our %globals  =   ( SHAREDIR => '/usr/share/shorewall' ,
 		    ORIGINAL_POLICY_MATCH => '',
 		    LOGPARMS => '',
 		    TC_SCRIPT => '',
-		    VERSION =>  '3.9.7',
+		    VERSION =>  '4.0.0-Beta1',
 		  );
 
 #
diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index 99cb0d8f6..1016bdc32 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -1308,7 +1308,7 @@ sub process_rules() {
 }
 
 #
-# To quote an old comment, generate_matrix makes a sows ear out of a silk purse.
+# To quote an old comment, "generate_matrix makes a sows ear out of a silk purse".
 #
 # The biggest disadvantage of the zone-policy-rule model used by Shorewall is that it doesn't scale well as the number of zones increases (Order N**2 where N = number of zones).
 # A major goal of the rewrite of the compiler in Perl was to restrict those scaling effects to this functions and the rules that it generates.
@@ -1375,15 +1375,23 @@ sub generate_matrix() {
 	}
     }
 
+    #
+    # Set a breakpoint in this function if you want to step through generate_matrix(). 
+    #
+    sub start_matrix() {
+    }
+
+    #
+    # Generate_Matrix() Starts Here
+    #
+    start_matrix;
+
     my $prerouting_rule  = 1;
     my $postrouting_rule = 1;
     my $exclusion_seq    = 1;
     my %chain_exclusions;
     my %policy_exclusions;
 
-    #
-    # Generate_Matrix() Starts Here
-    #
     for my $interface ( @interfaces ) {
 	addnatjump 'POSTROUTING' , snat_chain( $interface ), "-o $interface ";
     }
@@ -1456,7 +1464,6 @@ sub generate_matrix() {
 	my $complex          = $zoneref->{options}{complex} || 0;
 	my $type             = $zoneref->{type};
 	my $exclusions       = $zoneref->{exclusions};
-	my $need_broadcast   = {}; ### Fixme ###
 	my $frwd_ref         = 0;
 	my $chain            = 0;
 	my %needbroadcast;
@@ -1549,7 +1556,7 @@ sub generate_matrix() {
 		    # One thing that the Llama fails to mention is that evaluating a hash in a numeric context produces a warning.
 		    #
 		    no warnings;
-		    next if (  %{ $zoneref->{interfaces}} < 2 ) && ! ( $zoneref->{options}{in_out}{routeback} || @$exclusions );
+		    next if ( %{ $zoneref->{interfaces} } < 2 ) && ! ( $zoneref->{options}{in_out}{routeback} || @$exclusions );
 		}
 
 		if ( $chain =~ /2all$/ ) {
diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh
index ddd61e149..573df49b2 100755
--- a/Shorewall-perl/install.sh
+++ b/Shorewall-perl/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec
index 116c83642..e6521ed82 100644
--- a/Shorewall-perl/shorewall-perl.spec
+++ b/Shorewall-perl/shorewall-perl.spec
@@ -1,6 +1,6 @@
 %define name shorewall-perl
-%define version 3.9.7
-%define release 1
+%define version 4.0.0
+%define release 0Beta1
 %define prefix /usr
 
 Summary: Shoreline Firewall Perl-based compiler.
@@ -80,6 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING releasenotes.txt
 
 %changelog
+* Tue May 15 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta1
 * Fri May 11 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.7-1
 * Sat May 05 2007 Tom Eastep tom@shorewall.net
diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh
index 4bb57902b..ad3806d02 100755
--- a/Shorewall-shell/install.sh
+++ b/Shorewall-shell/install.sh
@@ -22,7 +22,7 @@
 #       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-VERSION=3.9.7
+VERSION=4.0.0-Beta1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec
index 13ef84f49..50bda258a 100644
--- a/Shorewall-shell/shorewall-shell.spec
+++ b/Shorewall-shell/shorewall-shell.spec
@@ -1,6 +1,6 @@
 %define name shorewall-shell
-%define version 3.9.7
-%define release 1
+%define version 4.0.0
+%define release 0Beta1
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -63,6 +63,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING INSTALL 
 
 %changelog
+* Tue May 15 2007 Tom Eastep tom@shorewall.net
+- Updated to 4.0.0-0Beta1
 * Fri May 11 2007 Tom Eastep tom@shorewall.net
 - Updated to 3.9.6-1
 * Sat May 05 2007 Tom Eastep tom@shorewall.net