diff --git a/APPL/ALG/alg_edit_ruimte.asp b/APPL/ALG/alg_edit_ruimte.asp
index d492421cc1..558c516077 100644
--- a/APPL/ALG/alg_edit_ruimte.asp
+++ b/APPL/ALG/alg_edit_ruimte.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <%
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 11:47a $
+/*  $Revision: 3 $
+    $Modtime: 10/05/09 3:27p $
 
     File:               bez_show_afspraak.asp
     Status:             10% (new style)
@@ -13,7 +13,6 @@
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/iface.inc" -->
 <!--#include file="../Shared/persoonselector.inc" -->
@@ -28,7 +27,6 @@
 <%
 FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "date.js"]})
 
-// AUTORISATIEPARAMETERS
    var room_key  = parseInt(getQParam("room_key", "-1"), 10);
    var loc_key
    var bld_key
@@ -48,8 +46,7 @@ if  (room_key > 0)
     sql =    " select * "
     + "  FROM ALG_RUIMTE " 
     + "       WHERE alg_ruimte_key = " + room_key;
-    
-    
+        
     oRsMes = Oracle.Execute(sql);
 
     if (!oRsMes.eof ) {
diff --git a/APPL/ALG/alg_edit_ruimte_save.asp b/APPL/ALG/alg_edit_ruimte_save.asp
index aa8ee4b9a7..b16a83ba24 100644
--- a/APPL/ALG/alg_edit_ruimte_save.asp
+++ b/APPL/ALG/alg_edit_ruimte_save.asp
@@ -1,7 +1,7 @@
 <%@language = "javascript" %>
 <% /*
-     $Revision: 1 $
-     $Modtime: 30-09-09 9:44 $
+     $Revision: 2 $
+     $Modtime: 10/05/09 3:34p $
 
      SUBMIT-form
 */ %>
@@ -17,28 +17,43 @@
 <!-- #include file="../Shared/date_sql.inc" -->
 
 <% FCLTHeader.Requires({ plugins:["jQuery"],
-                      js: ["FcltMgr.js"]
+                      js: []
                     }) %>
 <%
-  var reg_key = getQParamInt( "regio_key" );
+  var room_key = getQParamInt( "room_key" );
 
-  var fields =  [ { dbs: "alg_regio_omschrijving", typ: "varchar",  frm: "reg_oms" }];
+  var fields =  [ { dbs: "ALG_VERDIEPING_KEY", typ: "key",  frm: "verdiepingkey" },
+                  { dbs: "ALG_SRTRUIMTE_KEY", typ: "key",  frm: "room_srt" },
+                  { dbs: "ALG_RUIMTE_NR", typ: "varchar",  frm: "room_nr" },
+                  { dbs: "ALG_RUIMTE_ACADKEY", typ: "varchar",  frm: "room_ackey" },
+                  { dbs: "ALG_RUIMTE_OMSCHRIJVING", typ: "varchar",  frm: "room_oms" },
+                  { dbs: "ALG_RUIMTE_GETEKEND", typ: "date",  frm: "room_tek" },
+                  { dbs: "ALG_RUIMTE_BRUTO_VLOEROPP", typ: "number",  frm: "room_opp" },
+                  { dbs: "ALG_RUIMTE_OMTREK", typ: "number",  frm: "room_omt" },
+                  { dbs: "ALG_RUIMTE_INHOUD", typ: "number",  frm: "room_inh" },
+                  { dbs: "ALG_RUIMTE_OPMERKING", typ: "varchar",  frm: "room_opm" },
+                  { dbs: "ALG_RUIMTE_VLOER_OMSCHRIJVING", typ: "varchar",  frm: "room_flrom" },
+                  { dbs: "ALG_RUIMTE_OPP_GEVELGLAS", typ: "number",  frm: "room_gegl" },
+                  { dbs: "ALG_RUIMTE_OPP_SEPARATIEGLAS", typ: "number",  frm: "room_segl" },
+                  { dbs: "ALG_RUIMTE_OPP_GEVELBEKLEDING", typ: "number",  frm: "room_gebe" },
+                  { dbs: "ALG_RUIMTE_OPP_ALT1", typ: "number",  frm: "room_oppa1" },
+                  { dbs: "ALG_RUIMTE_OPP_ALT2", typ: "varchar",  frm: "room_oppa2" }];
 
-if (reg_key > 0)
+if (room_key > 0)
   {
-    sql = buildUpdate("alg_regio", fields)
-        + "     alg_regio_key = " + reg_key;
+    sql = buildUpdate("alg_ruimte", fields)
+        + "     alg_ruimte_key = " + room_key;
 
     oRs = Oracle.Execute(sql);
   }
 else
   {
-    fields.push({  dbs: "alg_regio_key",         typ: "key",      seq: "alg_s_alg_regio_key" });
-  var regIns = buildInsert("alg_regio", fields);
-  var reg_key = regIns.sequences["alg_regio_key"];
+    fields.push({  dbs: "alg_ruimte_key",         typ: "key",      seq: "alg_s_alg_onroerendgoed_keys" });
+    var regIns = buildInsert("alg_ruimte", fields);
+    var room_key = regIns.sequences["alg_ruimte_key"];
 
-  sql = regIns.sql;
-  oRs = Oracle.Execute( sql );
+    sql = regIns.sql;
+    oRs = Oracle.Execute( sql );
   }
   %>
 
@@ -46,7 +61,7 @@ else
   <head>
     <%  FCLTHeader.Generate() %>
     <script>
-        $(document).ready(function () { FcltMgr.closeDetail(window, { regio_key: <%=reg_key%> }); } );
+        $(document).ready(function () { FcltMgr.closeDetail(window, { room_key: <%=room_key%> }); } );
     </script>
   </head>
   <body>
diff --git a/APPL/ALG/alg_ruimte.asp b/APPL/ALG/alg_ruimte.asp
index 9a67594572..20b02c861d 100644
--- a/APPL/ALG/alg_ruimte.asp
+++ b/APPL/ALG/alg_ruimte.asp
@@ -1,8 +1,8 @@
 <%@language = "javascript" %>
 <%  // testing: bes_key=1251054
 
-/*  $Revision: 2 $
-    $Modtime: 10/05/09 11:35a $
+/*  $Revision: 3 $
+    $Modtime: 10/05/09 3:33p $
 
     File:               bes_edit.asp
     Status:             40% (new style)
@@ -14,7 +14,6 @@
     Note:
 
 */ %>
-<% Response.Expires = -1; %>
 <!--#include file="../../cust/install.inc" -->
 <!--#include file="../Shared/funcodes.inc" -->
 
@@ -23,7 +22,7 @@
 <!--#include file="../Shared/algautlevel.inc" -->
 <!--#include file="../Shared/cmenuFn.inc"-->
 <%
-FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "FCLTMgr.js", "jquery-ui.js"]})
+FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "jquery-ui.js"]})
 
   var autfunction = "WEB_ALGMAN";
   var authparams = user.checkAutorisation(autfunction);   //Wat weet ik dan nou van disciplines???
@@ -39,6 +38,23 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["expand_frame.js", "FCLT
 <%
    FCLTHeader.Generate();
 %>
+  <script  type="text/javascript" >
+      function algClose(params)
+      {
+          <% if (room_key == -1)
+             { %>
+              if (params.cancel)
+              {
+                  FcltMgr.closeDetail(window, params );
+                  return true;
+              }
+              FcltMgr.setTitle("<%=lcl_room%> " + params.room_key, {hot:false});
+              window.location.href = "alg_ruimte.asp?verynew=1&key=" + params.room_key;
+          <% } else { // Bestaande melding bewerkt, switch naar show-mode %>
+              $("#algFrame")[0].src = "alg_show_ruimte.asp?room_key=<%=room_key%>";
+          <% } %>
+      }
+    </script>
 </head>
 <body id="editbody">
 <%
@@ -49,8 +65,8 @@ else
 page += "?room_key="+room_key;
 
 IFRAMER("algFrame", page, { title: lcl_alg_ruimte_frame,
-                            initHeight: "450px"
-                             } );
+                            initHeight: "450px",
+                            FcltClose: "algClose" } );
 
 // AKZA#88 don not allow printing if call isn't saved yet.
 // UWVA#427 also print for FE