diff --git a/SQLinDS/000_libname/dssql.sas b/SQLinDS/000_libname/dssql.sas
index 3281737..690c625 100644
--- a/SQLinDS/000_libname/dssql.sas
+++ b/SQLinDS/000_libname/dssql.sas
@@ -33,7 +33,7 @@ data _null_;
   call execute ("options " || strip(option) || ";");
 run;
 
-proc delete data = _last_;
+proc delete data = WORK._last_;
 run;
 
 libname dsSQL LIST;
diff --git a/SQLinDS/002_function/dssql.sas b/SQLinDS/002_function/dssql.sas
index c73b1c6..9ff916c 100644
--- a/SQLinDS/002_function/dssql.sas
+++ b/SQLinDS/002_function/dssql.sas
@@ -15,7 +15,7 @@
 /*** HELP END ***/
 
 proc fcmp 
-  inlib  = work.&packageName.fcmp
+  /*inlib  = work.&packageName.fcmp*/
   outlib = work.&packageName.fcmp.package
 ;
   function dsSQL(unique_index_2, query $) $ 41;
diff --git a/SQLinDS/generate_package_sqlinds.sas b/SQLinDS/generate_package_sqlinds.sas
index c6e0d7f..30c15f0 100644
--- a/SQLinDS/generate_package_sqlinds.sas
+++ b/SQLinDS/generate_package_sqlinds.sas
@@ -1,8 +1,8 @@
-
+
 %include "C:\SAS_PACKAGES\generatePackage.sas";
 
 ods html;
-%generatePackge(filesLocation=C:\SAS_PACKAGES\SQLinDS)
+%generatePackge(filesLocation=C:\SAS_PACKAGES_DEV\SQLinDS)
 
 
 /*
diff --git a/generatePackage.sas b/generatePackage.sas
index 6bbc002..5d1643a 100644
--- a/generatePackage.sas
+++ b/generatePackage.sas
@@ -580,7 +580,7 @@ data _null_;
 
   /* delete macros and formats */
   put 'proc sql;';
-  put '  create table _%sysfunc(datetime(), hex16.)_ as';
+  put '  create table WORK._%sysfunc(datetime(), hex16.)_ as';
   put '  select memname, objname, objtype';
   put '  from dictionary.catalogs';
   put '  where ';
@@ -626,14 +626,14 @@ data _null_;
 
   put 'data _null_;';
   put '  do until(last.memname);';
-  put '    set _last_;';
+  put '    set WORK._last_;';
   put '    by objtype memname;';
   put '    if first.memname then call execute("proc catalog cat = work." !! strip(memname) !! " force;");';
   put '    call execute("delete " !! strip(objname) !! " /  et =" !! objtype !! "; run;");';
   put '  end;';
   put '  call execute("quit;");';
   put 'run;';
-  put 'proc delete data = _last_;';
+  put 'proc delete data = WORK._last_;';
   put 'run;';
 
   /* delete the link to the formats catalog */
@@ -757,7 +757,7 @@ data _null_;
   put '  else stop;                                                   ';
   put 'run;                                                           ' /;
 
-  put 'data _%sysfunc(datetime(), hex16.)_;                           ';
+  put 'data WORK._%sysfunc(datetime(), hex16.)_;                      ';
   put 'infile cards4 dlm = "/";                                       ';
   put 'input @;                                                       ';
   put 'if 0 then output;                                              ';
@@ -800,7 +800,7 @@ data _null_;
         'put; put '' *> No help info found. Try %helpPackage(packageName,*) to display all.''; put; stop; ' / 
       'end; ';
   put '  do until(EOFDS);                                                                                                  ';
-  put '    set _last_ end = EOFDS nobs = NOBS;                                                                             ';
+  put '    set WORK._last_ end = EOFDS nobs = NOBS;                                                                        ';
   put '    length memberX $ 1024;                                                                                          ';
   put '    memberX = cats("_",folder,".",file);                                                                            ';
   /* inner datastep in call execute to read each embedaded file */
@@ -827,7 +827,7 @@ data _null_;
   put "run; ";
   
   /* cleanup */
-  put "proc delete data = _last_; ";
+  put "proc delete data = WORK._last_; ";
   put "run; ";
   put 'options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp.; ' /;
  
diff --git a/sqlinds.zip b/sqlinds.zip
index 10e113e..46f2633 100644
Binary files a/sqlinds.zip and b/sqlinds.zip differ