diff --git a/Screens/f155.sql b/Screens/f155.sql
index cb48ecc..6a84f69 100644
--- a/Screens/f155.sql
+++ b/Screens/f155.sql
@@ -13,8 +13,8 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   14:56 Wednesday March 12, 2008
---   Exported By:     PRIESTJ
+--   Date and Time:   16:02 Wednesday March 12, 2008
+--   Exported By:     MULLENM
 --   Flashback:       0
 --   Export Type:     Application Export
 --   Version: 3.1.0.00.32
@@ -28,7 +28,7 @@ prompt  APPLICATION 155 - webmip
 --   Pages:                52
 --     Items:             358
 --     Computations:        1
---     Validations:       279
+--     Validations:       283
 --     Processes:          94
 --     Regions:            77
 --     Buttons:           113
@@ -145,7 +145,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 28038130488354430 + wwv_flow_api.g_id_offset,
   p_error_template    => 42209241448421762 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'N',
-  p_checksum_salt_last_reset => '20080312145617',
+  p_checksum_salt_last_reset => '20080312160253',
   p_home_link         => 'f?p=&APP_ID.:101',
   p_flow_language     => 'en-gb',
   p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE',
@@ -187,8 +187,8 @@ wwv_flow_api.create_flow(
   p_default_listr_template => 28038130488354430 + wwv_flow_api.g_id_offset,
   p_substitution_string_01 => 'SYSTEM_ENVIRONMENT',
   p_substitution_value_01  => '(Development)',
-  p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss=> '20080312145617',
+  p_last_updated_by => 'MULLENM',
+  p_last_upd_yyyymmddhh24miss=> '20080312160253',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -2137,6 +2137,21 @@ wwv_flow_api.create_app_comments (
 end;
 /
 begin
+wwv_flow_api.create_app_comments (
+  p_id=>3766712284937437 + wwv_flow_api.g_id_offset,
+  p_flow_id=>wwv_flow.g_flow_id,
+  p_pages=>'69',
+  p_app_comment=>'Ticket #342'||chr(10)||
+''||chr(10)||
+'More not null validations added to the address fields to stop people from trying to store invalid addresses.',
+  p_updated_on=>'2008.03.12.16:02:35',
+  p_updated_by=>'MULLENM',
+  p_created_on=>'2008.03.12.16:02:35',
+  p_created_by=>'MULLENM',
+  p_app_version=>'');
+end;
+/
+begin
 wwv_flow_api.create_app_comments (
   p_id=>39796811587940845 + wwv_flow_api.g_id_offset,
   p_flow_id=>wwv_flow.g_flow_id,
@@ -38611,7 +38626,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss => '20080306154838',
+  p_last_upd_yyyymmddhh24miss => '20080312160127',
   p_page_is_public_y_n=> 'N',
   p_page_comment  => '');
  
@@ -39288,6 +39303,98 @@ end;
 /
 
  
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 3764506135916684 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 69,
+  p_validation_name => 'P69_ADDR_STREET not null',
+  p_validation_sequence=> 50,
+  p_validation => 'P69_ADDR_STREET',
+  p_validation_type => 'ITEM_NOT_NULL',
+  p_error_message => 'Street must be specified',
+  p_when_button_pressed=> 20959412356304544 + wwv_flow_api.g_id_offset,
+  p_associated_item=> 20961229042304545 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> '');
+ 
+null;
+ 
+end;
+/
+
+ 
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 3764716178919617 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 69,
+  p_validation_name => 'P69_ADDR_CITY not null',
+  p_validation_sequence=> 60,
+  p_validation => 'P69_ADDR_CITY',
+  p_validation_type => 'ITEM_NOT_NULL',
+  p_error_message => 'City must be specified.',
+  p_when_button_pressed=> 20959412356304544 + wwv_flow_api.g_id_offset,
+  p_associated_item=> 20961413040304545 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> '');
+ 
+null;
+ 
+end;
+/
+
+ 
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 3765224835922082 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 69,
+  p_validation_name => 'P69_ADDR_SUB_BUILDING Not Null',
+  p_validation_sequence=> 70,
+  p_validation => 'P69_ADDR_SUB_BUILDING',
+  p_validation_type => 'ITEM_NOT_NULL',
+  p_error_message => 'Either sub-building or building must be specified.',
+  p_validation_condition=> 'P69_ADDR_BUILDING',
+  p_validation_condition_type=> 'ITEM_IS_NULL',
+  p_when_button_pressed=> 20959412356304544 + wwv_flow_api.g_id_offset,
+  p_associated_item=> 20960622429304545 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> 'generated 12-MAR-2008 16:00');
+ 
+null;
+ 
+end;
+/
+
+ 
+begin
+ 
+wwv_flow_api.create_page_validation(
+  p_id => 3765415825922082 + wwv_flow_api.g_id_offset,
+  p_flow_id => wwv_flow.g_flow_id,
+  p_flow_step_id => 69,
+  p_validation_name => 'P69_ADDR_BUILDING Not Null',
+  p_validation_sequence=> 80,
+  p_validation => 'P69_ADDR_BUILDING',
+  p_validation_type => 'ITEM_NOT_NULL',
+  p_error_message => 'Either sub-building or building must be specified.',
+  p_validation_condition=> 'P69_ADDR_SUB_BUILDING',
+  p_validation_condition_type=> 'ITEM_IS_NULL',
+  p_when_button_pressed=> 20959412356304544 + wwv_flow_api.g_id_offset,
+  p_associated_item=> 20961021950304545 + wwv_flow_api.g_id_offset,
+  p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
+  p_validation_comment=> 'generated 12-MAR-2008 16:00');
+ 
+null;
+ 
+end;
+/
+
+ 
 begin
  
 declare