Merge pull request #114 from yabwon/main

pull request
The BasePlus package [ver. 2.4.1]
2025-12-11 03:04:35 +00:00 · 2025-09-09 22:46:31 +02:00 · 2025-09-05 10:30:18 +02:00 · 2025-08-07 18:49:17 +02:00 · 2025-08-07 18:26:26 +02:00 · 2025-08-05 14:19:19 -04:00
23 changed files with 3165 additions and 1264 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2019 - 2023 Bartosz Jablonski   
+Copyright (c) 2019 - 2025 Bartosz Jablonski   

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -2,21 +2,25 @@

 ---

-## Intro:
-
 A **SAS package** is an automatically generated, single, stand alone *zip* file containing organised and ordered code structures, created by the developer and extended with additional automatically generated "driving" files (i.e. description, metadata, load, unload, and help files). 

 The *purpose of a package* is to be a simple, and easy to access, code sharing medium, which will allow: on the one hand, to separate the code complex dependencies created by the developer from the user experience with the final product and, on the other hand, reduce developer's and user's unnecessary frustration related to a remote deployment process.

 In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. 

-Don't forget to **STAR** (:star:) the repository! :-)
+Don't forget to give the repository a **STAR** and become [stargazer](https://github.com/yabwon/SAS_PACKAGES/stargazers)! :-)
+
+---

 ---

 ### Current version:

-**The latest version** of SPF is **`20240711`**.  
+**The latest version** of the **SAS Packages Framework** is **`20250729`**.  
+
+---
+
+## Intro: 

 To get started with SAS Packages try this [**`Getting Started with SAS Packages`**](https://github.com/yabwon/SAS_PACKAGES/blob/main/SPF/Documentation/Getting_Started_with_SAS_Packages.pdf "Getting Started with SAS Packages") presentation (see the `./SPF/Documentation` directory).

@@ -51,24 +55,30 @@ Letter "D" indicates tutorial dedicated for developers and "U" materials for use

 3) (D) Article and all required materials for ["My first SAS Package"](https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation/Paper_1079-2021) tutorial.

-4) (DU) Materials from Hands-on-Workshop (4+ hours) tutorial: [Share your code with SAS Packages](https://github.com/yabwon/HoW-SASPackages).
+4) (DU) Materials from Hands-on-Workshop (4+ hours) tutorial: [Share your code with SAS Packages](https://github.com/yabwon/HoW-SASPackages). 
+   It is a "zero to hero" tutorial that explains all the "bells and whistles" of using, and all the "nuts and bolts" of developing SAS packages.

+---

 ---

 ### Initiative to add SAS Packages Framework to SAS Base/Viya:

-A **SASware Ballot Idea** for adding *SAS Packages Framework* macros into Base SAS and Viya was submitted Friday, May 27th 2022. If you would like to support the idea visit this [communities.sas.com post](https://communities.sas.com/t5/SASware-Ballot-Ideas/Add-SAS-Packages-Framework-to-the-SAS-Base-Viya/idi-p/815508) and up vote the idea!
+A **SASware Ballot Idea** for adding *SAS Packages Framework* macros into Base SAS and Viya was submitted Friday, May 27th 2022. If you would like to support the idea visit this [**communities.sas.com post**](https://communities.sas.com/t5/SASware-Ballot-Ideas/Add-SAS-Packages-Framework-to-the-SAS-Base-Viya/idi-p/815508) and up vote the idea! We have 46 likes from 44 supporters up to today (as of April 22, 2025)!

 ---

-### The User:
+### A Brief User Manual:
+
+This is a brief intro. See below to find a link to detailed workshop materials.
+
+#### Create directory 

 The first step to use a package with the SAS Packages Framework:

- Create a folder for your packages, under Windows OS family e.g., `C:/SAS_PACKAGES` or under Linux/UNIX OS family e.g., `/home/<username>/SAS_PACKAGES`.
+- Create a folder for your packages, under Windows OS family e.g., `C:/SAS_PACKAGES` or under Linux/UNIX OS family e.g., `/home/<username>/SAS_PACKAGES`. The path selected is totally up to you.

-Then either:
+#### Manual installation 

 - Manually download the `SPFinit.sas` file (the SAS Packages Framework) into the local packages folder.
 - \[Optional\] Manually download the `<packageName>.zip` file into the local packages folder.
@@ -84,7 +94,11 @@ filename packages "<directory/containing/packages/>";         /* setup directory
 %loadPackage(packageName)                                     /* load the package content into the SAS session */
 ```

-or if you need it just for "one time" only:
+---
+
+#### Automatic (one-time-only) installation 
+
+If you need it just for "one time" only, e.g., for test if you like it:

 - Execute: 

@@ -98,9 +112,13 @@ filename SPFinit url "https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main
 %loadPackage(packageName)    /* load the package content into the SAS session */
 ```

-or do it pragmatically:
+---

- Enable the framework [first time only]:
+#### Automatic (permanent) installation
+
+To install SPF pragmatically:
+
+- Enable the framework [do this first and one time only!]:

 ```sas
 filename SPFinit url "https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas";
@@ -121,7 +139,7 @@ filename packages "<directory/containing/packages/>";
 %installPackage(SPFinit) /* install the framework */
 ```

- From now on run it like this:
+- From now on, just like you would assign libraries, run the SPF and use packages like this:

 ```sas
 filename packages "<directory/containing/packages/>";
@@ -134,16 +152,20 @@ filename packages "<directory/containing/packages/>";

 ---

-The "Workshop video for the User" got outdated (in general). Newer version is coming soon, in the mean time see some of the videos from the "Recordings and Presentations" section above. 
+[**Detailed workshop materials**](https://github.com/yabwon/HoW-SASPackages) (i.e. "from 0 to hero" instruction).
+
+The youtube "Workshop video for the User" got outdated (in general). Newer version is coming soon, in the mean time see some of the videos from the "Recordings and Presentations" section above. 
 (You can watch the workshop if you wish, link is working and some parts are still valid source of information e.g., "`ICE` loading" or "`disk` loading")

 <s>[**Workshop video for the User**](https://youtu.be/qX_-HJ76g8Y) \[May 6th, 2020\] [~86 minutes, outdated (installPackage macro was not there yet) but gives the idea how it works especially load, help, unload, ICEload, and other details]</s>

 ---

-### The Developer:
+---

-To create your own package:
+### For The Developer:
+
+In brief, to create your own package:

 - Download (and use) the `SPFinit.sas` file (the SAS Packages Framework), the part of the framework required for *testing* is there too.

@@ -155,6 +177,8 @@ To create your own package:

 The SAS Packages Framework [(short) documentation](https://github.com/yabwon/SAS_PACKAGES/blob/main/SPF/SPFinit.md) to quickly see macros options and parameters.

+[**Detailed workshop materials**](https://github.com/yabwon/HoW-SASPackages) (i.e. "from 0 to hero" detailed instruction with a bunch of examples).
+
 ---

 ### If you have any questions, suggestions, or ideas do not hesitate to contact me!
@@ -163,6 +187,10 @@ The SAS Packages Framework [(short) documentation](https://github.com/yabwon/SAS

 ### Updates worth mentioning:

+**Update**\[October 27th, 2024\]**:** `%splitCodeForPackage()` **utility macro is available. (see [here](https://github.com/yabwon/SAS_PACKAGES/releases/tag/20241027 "splitCodeForPackage"))**.
+
+**Update**\[October 14th, 2024\]**:** `DS2PCK` and `DS2THR` **types for `PROC DS2` *threads* and *packages* added to the framework. (see [here](https://github.com/yabwon/SAS_PACKAGES/releases/tag/20241014 "PROC DS2"))**.
+
 **Update**\[December 10th, 2023\]**:** `markdownDoc=` **parameter added to** `%generatePackage()` **macro, which allows to generate markdown file with documentation. Content is taken from the help information notes and the description. (see [here](https://github.com/yabwon/SAS_PACKAGES/releases/tag/20231210 "markdown documentation"))**.

 **Update**\[November 11th, 2023\]**:** `KMFSNIP` **type for *key macro abbreviations* snippets added to the framework. (see [here](https://github.com/yabwon/SAS_PACKAGES/releases/tag/20231111 "KMF-abbreviations"))**.
@@ -192,6 +220,8 @@ The SAS Packages Framework [(short) documentation](https://github.com/yabwon/SAS
 ## Where the SAS Packages Framework is used:
 This is a list of locations where the SAS Packages Framework is used:
 - Warsaw (Poland)
+ - Osaka (Japan)
+ - Kyoto (Japan)

 If you want to share that you are using the SPF let me know and I'll update the list.

@@ -215,32 +245,32 @@ Packages:

 - **SQLinDS**

-  [Documentation for SQLinDS](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/sqlinds.md "Documentation for SQLinDS")
+  [Documentation for SQLinDS](https://github.com/SASPAC/blob/main/sqlinds.md "Documentation for SQLinDS")

  [SQLinDS in SASPAC](https://github.com/SASPAC/sqlinds "SQLinDS in SASPAC")


 - **DFA** (Dynamic Function Arrays)

-  [Documentation for DFA](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/dfa.md "Documentation for DFA")
+  [Documentation for DFA](https://github.com/SASPAC/blob/main/dfa.md "Documentation for DFA")

  [DFA in SASPAC](https://github.com/SASPAC/dfa "DFA in SASPAC")

 - **macroArray**

-  [Documentation for macroArray](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/macroarray.md "Documentation for macroArray")
+  [Documentation for macroArray](https://github.com/SASPAC/blob/main/macroarray.md "Documentation for macroArray")

  [MacroArray in SASPAC](https://github.com/SASPAC/macroarray "MacroArray in SASPAC")

 - **BasePlus**

-  [Documentation for BasePlus](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/baseplus.md "Documentation for BasePlus")
+  [Documentation for BasePlus](https://github.com/SASPAC/blob/main/baseplus.md "Documentation for BasePlus")

  [BasePlus in SASPAC](https://github.com/SASPAC/baseplus "BasePlus in SASPAC")

 - **GSM** (Generate Secure Macros)

-  [Documentation for GSM](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/gsm.md "Documentation for GSM")
+  [Documentation for GSM](https://github.com/SASPAC/blob/main/gsm.md "Documentation for GSM")

  [GSM in SASPAC](https://github.com/SASPAC/gsm "GSM in SASPAC")

--- a/SPF/Documentation/Paper_SM01-PHUSEEU2024.pdf
+++ b/SPF/Documentation/Paper_SM01-PHUSEEU2024.pdf
--- a/SPF/Documentation/SAS(r)
+++ b/SPF/Documentation/SAS(r)
--- a/SPF/Macros/extendpackagesfileref.sas
+++ b/SPF/Macros/extendpackagesfileref.sas
@@ -6,7 +6,7 @@
             when empty the "packages" value is used */
 )/secure
 /*** HELP END ***/
-des = 'Macro to list directories pointed by "packages" fileref, version 20240711. Run %extendPackagesFileref(HELP) for help info.'
+des = 'Macro to list directories pointed by "packages" fileref, version 20250729. Run %extendPackagesFileref(HELP) for help info.'
 ;

 %if %QUPCASE(&packages.) = HELP %then
@@ -22,7 +22,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20240711
    %put ###       This is short help information for the `extendPackagesFileref` macro            #;
    %put #-----------------------------------------------------------------------------------------#;;
    %put #                                                                                         #;
-    %put # Macro to list directories pointed by 'packages' fileref, version `20240711`             #;
+    %put # Macro to list directories pointed by 'packages' fileref, version `20250729`             #;
    %put #                                                                                         #;
    %put # A SAS package is a zip file containing a group                                          #;
    %put # of SAS codes (macros, functions, data steps generating                                  #;
@@ -43,6 +43,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20240711
    %put #                                                                                         #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`             #;
    %put # to learn more.                                                                          #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`                     #;
    %put #                                                                                         #;
    %put #### Example ##############################################################################;
    %put #                                                                                         #;
@@ -56,7 +57,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20240711
    %put #   Run the following code in your SAS session:                                           #;
    %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas;
    %put  %nrstr( filename packages ("C:/SAS_PK1" "C:/SAS_PK2"); %%* setup a directory for packages;        );
-    %put  %nrstr( %%include packages(SPFinit.sas);               %%* enable the framework;                  );
+    %put  %nrstr( %%include packages(SPFinit.sas);                %%* enable the framework;                  );
    %put  ;
    %put  %nrstr( filename packages ("D:/NEW_DIR" %%extendPackagesFileref()); %%* add new directory;        );
    %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~;
--- a/SPF/Macros/generatepackage.sas
+++ b/SPF/Macros/generatepackage.sas
@@ -3,7 +3,7 @@

   Macro to generate SAS packages.

-   Version 20240711
+   Version 20250729

   A SAS package is a zip file containing a group 
   of SAS codes (macros, functions, data steps generating 
@@ -18,7 +18,7 @@

 %macro generatePackage(
 filesLocation   /* location of package files 
-                    e.g. %sysfunc(pathname(work))/%lowcase(&packageName.) */
+                    e.g. /path/to/package/files/locatiion or C:\my\package\files */
 /* testing options: */
 ,testPackage=Y   /* indicator if tests should be executed, 
                    default value Y means "execute tests" */
@@ -43,7 +43,7 @@
                    file name be created */
 )/ secure minoperator
 /*** HELP END ***/
-des = 'Macro to generate SAS packages, version 20240711. Run %generatePackage() for help info.'
+des = 'Macro to generate SAS packages, version 20250729. Run %generatePackage() for help info.'
 ;
 %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then
  %do;
@@ -58,7 +58,7 @@ des = 'Macro to generate SAS packages, version 20240711. Run %generatePackage()
    %put ###      This is short help information for the `generatePackage` macro         #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro to generate SAS packages, version `20240711`                            #;
+    %put # Macro to generate SAS packages, version `20250729`                            #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -73,6 +73,7 @@ des = 'Macro to generate SAS packages, version 20240711. Run %generatePackage()
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to read about the details of package generation process.                      #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put #### Parameters:                                                                #;
    %put #                                                                               #;
@@ -375,8 +376,9 @@ options NOquotelenmax NOstimer NOfullstimer;
   different file reference for each package 
   while loading package with %loadPackage() macro
  */
-/* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */
-data _null_; call symputX("_PackageFileref_", "P" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); run;
+data _null_; 
+  call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
+run;

 /* test if version is a number */
 data _null_;
@@ -397,17 +399,17 @@ data _null_;
 run;

 /* create or replace the ZIP file for package  */
-filename &zipReferrence. ZIP "&filesLocation./%lowcase(&packageName.).zip";
+filename &zipReferrence. ZIP "&filesLocation./%sysfunc(lowcase(&packageName.)).zip";

 %if %sysfunc(fexist(&zipReferrence.)) %then 
  %do;
-    %put NOTE: Deleting file "&filesLocation./%lowcase(&packageName.).zip";
+    %put NOTE: Deleting file "&filesLocation./%sysfunc(lowcase(&packageName.)).zip";
    %let _RC_ = %sysfunc(fdelete(&zipReferrence.));
    %put NOTE: &=_RC_;
  %end;
 %if %sysfunc(fexist(&zipReferrence.)) %then 
  %do;
-    %put ERROR: File "&filesLocation./%lowcase(&packageName.).zip" cannot be deleted.;
+    %put ERROR: File "&filesLocation./%sysfunc(lowcase(&packageName.)).zip" cannot be deleted.;
    %put ERROR- Check if the file is not blocked by another process.; 
    %put ERROR- Aborting.;
    %abort;
@@ -434,7 +436,7 @@ Maintainer: Firstname Lastname (xxxxxx@yyyyy.com)
 License: MIT
 Encoding: UTF8

-Required: "Base SAS Software"                    :%*optional, COMMA separated, QUOTED list, names of required SAS products, values must be like from proc setinit;run; output *;
+Required: "Base SAS Software"                    :%*optional, COMMA separated, QUOTED list, names of required SAS products, values must be like from "proc setinit" output *;
 ReqPackages: "macroArray (0.1)", "DFA (0.1)"     :%*optional, COMMA separated, QUOTED list, names of required packages *;

 >> **DESCRIPTION** <<
@@ -510,7 +512,7 @@ DESCRIPTION END:
   |                       it will be created only if user request it by using:
   |                       %loadPackage(packagename, lazyData=klm)
   |                       multiple elements separated by space are allowed
-   |                       an asterisk(*) means "load all data"] 
+   |                       an asterisk("*") means "load all data"] 
   |
   +-010_imlmodule [one file one IML module,
   |             |  only plain code of the module, without "Proc IML" header]
@@ -527,6 +529,18 @@ DESCRIPTION END:
   |             |
   |             +-abc.sas [a file with a KMF-abbreviation snippet ABC, _with_ proper tagging, snippets names are in low-case]
   |
+   +-013_ds2pck [one file one PROC DS2 package]
+   |             |
+   |             +-abc.sas [a data set with a package ABC stored in WORK.ABC data set]
+   |             |
+   |             +-library.xyz.sas [a data set with a package LIBRARY.XYZ stored in LIBRARY.XYZ data set]
+   |
+   +-014_ds2thr [one file one PROC DS2 thread]
+   |             |
+   |             +-abc.sas [a data set with a thread ABC stored in WORK.ABC data set]
+   |             |
+   |             +-library.xyz.sas [a data set with a thread LIBRARY.XYZ stored in LIBRARY.XYZ data set]
+   |
   +-<sequential number>_<type [in lower case]>
   |
   +-00n_clean [if you need to clean something up after exec file execution,
@@ -609,6 +623,7 @@ data &filesWithCodes.;
       'IMLMODULE' 'PROTO' 'EXEC' 'CLEAN' 
       'LAZYDATA' 'TEST' 'CASLUDF'
       'ADDCNT' 'KMFSNIP'
+       'DS2PCK' 'DS2THR'
      )) 
    then 
      do;
@@ -687,6 +702,9 @@ run;
 %let notesSourceOptions = %sysfunc(getoption(notes)) %sysfunc(getoption(source));
 options NOnotes NOsource;

+options mprint;
+options notes source;
+
 proc sort data = &filesWithCodes.;
  by order type file;
 run;
@@ -793,7 +811,7 @@ run;
    /* code inspired by Kurt Bremser's "Talking to Your Host" article */
    /* https://communities.sas.com/t5/SAS-User-Groups-Library/WUSS-Presentation-Talking-to-Your-Host/ta-p/838344 */
    /* WUSS 2022 */
-    
+
    data &filesWithCodes.addCnt;
    run;

@@ -855,9 +873,12 @@ title6 "MD5 hashed fileref of package lowcase name: &_PackageFileref_.";
    title8 "Required SAS packages: %qsysfunc(compress(%superq(packageReqPackages),%str(%'%")))" ;   /* " */
  %end;

-footnote1 "SAS Packages Framework, version 20240711";
+footnote1 "SAS Packages Framework, version 20250729";

-proc print data = &filesWithCodes.(drop=base folderRef fileRef rc folderid _abort_ fileId additionalContent);
+proc print 
+  data = &filesWithCodes.(drop=base folderRef fileRef rc folderid _abort_ fileId additionalContent)
+  width=full
+;
 run;
 title;

@@ -876,7 +897,7 @@ title;
    title2 "Package additional content:";
    proc print 
      data=&filesWithCodes.addCnt(drop=root dir level)
-      label
+      label width=full
    ;
    run;
  %end;
@@ -921,26 +942,26 @@ run;
      length packageAuthor $ 1024;
      packageAuthor = symget('packageAuthor');
      put " ";
-      put "  Copyright (c) since %sysfunc(today(),year4.) " packageAuthor                   ;
-      put "                                                                                ";
-      put "  Permission is hereby granted, free of charge, to any person obtaining a copy  ";
-      put '  of this software and associated documentation files (the "Software"), to deal ';
-      put "  in the Software without restriction, including without limitation the rights  ";
-      put "  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell     ";
-      put "  copies of the Software, and to permit persons to whom the Software is         ";
-      put "  furnished to do so, subject to the following conditions:                      ";
-      put "                                                                                ";
-      put "  The above copyright notice and this permission notice shall be included       ";
-      put "  in all copies or substantial portions of the Software.                        ";
-      put "                                                                                ";
-      put '  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    ';
-      put "  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,      ";
-      put "  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   ";
-      put "  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER        ";
-      put "  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ";
-      put "  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ";
-      put "  SOFTWARE.                                                                     ";
-      put " ";
+      put "Copyright (c) since %sysfunc(today(),year4.) " packageAuthor                   ;
+      put "                                                                               ";
+      put "Permission is hereby granted, free of charge, to any person obtaining a copy  ";
+      put 'of this software and associated documentation files (the "Software"), to deal ';
+      put "in the Software without restriction, including without limitation the rights  ";
+      put "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell     ";
+      put "copies of the Software, and to permit persons to whom the Software is         ";
+      put "furnished to do so, subject to the following conditions:                      ";
+      put "                                                                              ";
+      put "The above copyright notice and this permission notice shall be included       ";
+      put "in all copies or substantial portions of the Software.                        ";
+      put "                                                                              ";
+      put 'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    ';
+      put "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,      ";
+      put "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   ";
+      put "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER        ";
+      put "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ";
+      put "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ";
+      put "SOFTWARE.                                                                     ";
+      put "                                                                              ";
    run;
  %end;

@@ -1017,37 +1038,49 @@ data _null_;
  put '  )/secure;                                                                ';
  put '    %PUT ** NOTE: Package ' "&packageName." ' loaded in ICE mode **;       ';
  put '    %local _PackageFileref_;                                               ';
-  put '    /* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */                  ';
-  put '    data _null_;                                                                                  ';
-  put '     call symputX("_PackageFileref_", "P" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); ';
-  put '    run;                                                                                          ';
+  put '    data _null_;                                                                                 ';
+  put '     call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); ';
+  put '    run;                                                                                         ';
  
  put '    filename &_PackageFileref_. &ZIP.                                      ';
-  put '      "&path./%lowcase(&packageName.).&zip." %unquote(&options.)           ';
+  put '      "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)  ';
  put '    ;                                                                      ';
  put '    %include &_PackageFileref_.(packagemetadata.sas) / &source2.;          ';
  put '    filename &_PackageFileref_. clear;                                     ';

           /* test if required version of package is "good enough" */
-  put '    %local rV pV;                                                          ';
-  put '    %let pV = %sysfunc(compress(&packageVersion.,.,kd));                   ';
-  put '    %let pV = %sysevalf((%scan(&pV.,1,.,M)+0)*1e8                          ';
-  put '                      + (%scan(&pV.,2,.,M)+0)*1e4                          ';
-  put '                      + (%scan(&pV.,3,.,M)+0)*1e0);                        ';
-  put '    %let rV = %sysfunc(compress(&requiredVersion.,.,kd));                  ';
-  put '    %let rV = %sysevalf((%scan(&rV.,1,.,M)+0)*1e8                          ';
-  put '                      + (%scan(&rV.,2,.,M)+0)*1e4                          ';
-  put '                      + (%scan(&rV.,3,.,M)+0)*1e0);                        ';
-  put '    %if %sysevalf(&requiredVersion. > &packageVersion.) %then              ';
+  put '    %local rV pV rV0 pV0 rVsign;                                           ';
+  put '    %let pV0 = %sysfunc(compress(&packageVersion.,.,kd));                  ';
+  put '    %let pV = %sysevalf((%scan(&pV0.,1,.,M)+0)*1e8                         ';
+  put '                      + (%scan(&pV0.,2,.,M)+0)*1e4                         ';
+  put '                      + (%scan(&pV0.,3,.,M)+0)*1e0);                       ';
+  put '                                                                           ';
+  put '    %let rV0 = %sysfunc(compress(&requiredVersion.,.,kd));                 ';
+  put '    %let rVsign = %sysfunc(compress(&requiredVersion.,<=>,k));             ';
+  put '    %if %superq(rVsign)= %then %let rVsign=<=;                             ';
+  put '    %else %if NOT (%superq(rVsign) IN (%str(=) %str(<=) %str(=<) %str(=>) %str(>=) %str(<) %str(>))) %then ';
+  put '      %do;                                                                                                 ';
+  put '        %put WARNING: Illegal operatopr "%superq(rVsign)"! Default(<=) will be used.;                      ';
+  put '        %put WARNING- Supported operators are: %str(= <= =< => >= < >);                                    ';
+  put '        %let rVsign=<=;                                                    ';
+  put '      %end;                                                                ';
+  put '    %let rV = %sysevalf((%scan(&rV0.,1,.,M)+0)*1e8                         ';
+  put '                      + (%scan(&rV0.,2,.,M)+0)*1e4                         ';
+  put '                      + (%scan(&rV0.,3,.,M)+0)*1e0);                       ';
+  put '                                                                           ';
+  put '    %if NOT %sysevalf(&rV. &rVsign. &pV.) %then                            ';
  put '      %do;                                                                 ';
-  put '        %put ERROR: Required version is &requiredVersion.;                 ';
-  put '        %put ERROR- Provided version is &packageVersion.;                  ';
-  put '        %GOTO WrongVersionOFPackage; /*%RETURN;*/                          '; 
+  put '        %put ERROR: Package &packageName. will not be loaded!;             ';
+  put '        %put ERROR- Required version is &rV0.;                             ';
+  put '        %put ERROR- Provided version is &pV0.;                             ';
+  put '        %put ERROR- Condition %bquote((&rV0. &rVsign. &pV0.)) evaluates to %sysevalf(&rV. &rVsign. &pV.);  ';
+  put '        %put ERROR- Verify installed version of the package.;              ';
+  put '        %put ERROR- ;                                                      ';
+  put '        %GOTO WrongVersionOFPackage; /*%RETURN;*/                          ';
  put '      %end;                                                                ';

-
  put '    filename &_PackageFileref_. &ZIP.                                      ';
-  put '      "&path./%lowcase(&packageName.).&zip." %unquote(&options.)           ';
+  put '      "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)  ';
  put '      ENCODING =                                                           ';
  put '        %if %bquote(&packageEncoding.) NE %then &packageEncoding. ;        ';
  put '                                          %else utf8 ;                     ';
@@ -1111,6 +1144,8 @@ data _null_;
  isProto     = 0;
  isIMLmodule = 0;
  isCASLudf   = 0;
+  isDS2pck    = 0;
+  isDS2thr    = 0;

  %if (%superq(packageRequired) ne ) 
   or (%superq(packageReqPackages) ne ) 
@@ -1350,7 +1385,7 @@ data _null_;
      ('LIBNAME' 'MACRO' /*'MACROS'*/ 'DATA' 
       'FUNCTION' /*'FUNCTIONS'*/ 'FORMAT' /*'FORMATS'*/ 
       'IMLMODULE' 'PROTO' 'EXEC' 'CLEAN' 
-       'LAZYDATA' 'TEST' 'ADDCNT' 'KMFSNIP')) 
+       'LAZYDATA' 'TEST' 'ADDCNT' 'KMFSNIP' 'DS2PCK' 'DS2THR')) 
    then 
      do;
        putlog 'WARNING: Type ' type 'is not yet supported.';
@@ -1361,26 +1396,29 @@ data _null_;
    isFormat    + (upcase(type)=:'FORMAT'); 
    isProto     + (upcase(type)=:'PROTO');
    isIMLmodule + (upcase(type)=:'IMLMODULE');
+    isDS2pck    + (upcase(type)=:'DS2PCK');
+    isDS2thr    + (upcase(type)=:'DS2THR');

-    /* HEADERS for IML, FCMP, and PROTO - start */
+    
+    /* HEADERS for PROC IML, FCMP, and PROTO - start */
    if 1 = isFunction and upcase(type)=:'FUNCTION' then 
      do;
        /* macro variable for test if cherry picking used FCMP */
-        put 'data _null_;                                ';
-        put "  call symputX('cherryPick_FCMP', exist('work.%lowcase(&packageName.fcmp)'), 'L'); ";
-        put 'run;                                        ';
+        put 'data _null_; ';
+        put "  call symputX('cherryPick_FCMP', exist('work.&packageName.fcmp'), 'L'); ";
+        put 'run; ';
      end;
    if 1 = FIRST.type and upcase(type)='FUNCTIONS' then 
      do;
        /* header for multiple functions in one FCMP run */
-        put "proc fcmp outlib = work.%lowcase(&packageName.fcmp).package ; ";
+        put "proc fcmp outlib = work.&packageName.fcmp.package ; ";
      end;
    if 1 = isProto and upcase(type)='PROTO' then 
      do;
        /* macro variable for test if cherry picking used PROTO */
-        put 'data _null_;                                ';
-        put "  call symputX('cherryPick_PROTO', exist('work.%lowcase(&packageName.proto)'), 'L'); ";
-        put 'run;                                        ';
+        put 'data _null_; ';
+        put "  call symputX('cherryPick_PROTO', exist('work.&packageName.proto'), 'L'); ";
+        put 'run; ';
      end;
    if 1 = FIRST.type and upcase(type)='PROTO' then 
      do;
@@ -1389,20 +1427,20 @@ data _null_;
                          value of "package=" overwrites previously created content
                        */
        /* header for multiple functions in one PROTO run */
-        put "proc proto package = work.%lowcase(&packageName.proto).package" ProtoGrpNum /
+        put "proc proto package = work.&packageName.proto.package" ProtoGrpNum /
            " LABEL='Proc Proto C functions for &packageName. package, part" ProtoGrpNum "' ; ";
      end;
    if 1 = isFormat and upcase(type)=:'FORMAT' then 
      do;
        /* macro variable for test if cherry picking used FORMAT */
-        put 'data _null_;                                  ';
-        put "  call symputX('cherryPick_FORMAT', cexist('work.%lowcase(&packageName.format)'), 'L'); ";
-        put 'run;                                          ';
+        put 'data _null_; ';
+        put "  call symputX('cherryPick_FORMAT', cexist('work.&packageName.format'), 'L'); ";
+        put 'run; ';
      end;
    if 1 = FIRST.type and upcase(type)='FORMATS' then 
      do;
        /* header, for FORMATS */
-        put "proc format lib = work.%lowcase(&packageName.format) ; ";
+        put "proc format lib = work.&packageName.format ; ";
      end;
    if 1 = isIMLmodule and upcase(type)='IMLMODULE' then 
      do;
@@ -1420,7 +1458,7 @@ data _null_;
        /* header, for IML modules */
        put "proc iml ; ";
      end;
-    /* HEADERS for IML, FCMP, and PROTO - end */
+    /* HEADERS for PROC IML, FCMP, and PROTO - end */

    put ' ' /
        '%if (%str(*)=%superq(cherryPick)) or (' fileshort +(-1) ' in %superq(cherryPick)) %then %do; '; /* Cherry Pick test1 start */
@@ -1431,6 +1469,8 @@ data _null_;
      put '  %put %sysfunc(ifc(%SYSMACEXIST(' fileshort +(-1) ')=1, NOTE# Macro ' fileshort 
          "exist. It will be overwritten by the macro from the &packageName. package, ));";

+         
+    /* separate approach for EXEC */
    if upcase(type)=:'EXEC' then
      do;
        /* User can suppress running the exec files */
@@ -1453,9 +1493,84 @@ data _null_;
          / ' )));'
          ;
      end;
-    else
+    /* separate approach for DS2 */
+    else if (upcase(type) in: ('DS2PCK' 'DS2THR')) then
      do;
-        /* include the file with the code of the element */
+        if 1 = isDS2pck and upcase(type)=:'DS2PCK' then 
+          do;
+            /* macro variable for test if cherry picking used DS2 package */
+            put 'data _null_;                                 ';
+            put "  call symputX('cherryPick_DS2PCK', 0, 'L'); ";
+            put 'run;                                         ';
+          end;
+        if 1 = isDS2thr and upcase(type)=:'DS2THR' then 
+          do;
+            /* macro variable for test if cherry picking used DS2 threads */
+            put 'data _null_;                                 ';
+            put "  call symputX('cherryPick_DS2THR', 0, 'L'); ";
+            put 'run;                                         ';
+          end;
+
+
+        /* since DS2 packages and threads are stored in SAS data sets */
+        /* we have to check (before loading) if there is no "regular" */
+        /* data set (or view) with the same name to avoid overwriting */
+        if upcase(type) in: ('DS2PCK' 'DS2THR') then
+          do;
+            length DS2lib $ 8 DS2ds $ 32;
+            DS2lib = coalescec(scan(fileshort,-2,"."), "WORK");
+            DS2ds  = scan(fileshort,-1,".");
+
+          put '%put %sysfunc(ifc(%sysfunc(exist(' fileshort +(-1) '))=1,'  
+            / '%sysfunc(dosubl(%str(options ps=min; title; options msglevel=n nodate notes source nomprint;' 
+            / '  data _null_;' 
+            / '    id = OPEN("' fileshort +(-1) '");' 
+            / '    if id then do;' 
+            / '      x = VARNUM(id, "SAS_CHECKSUM_") AND VARNUM(id, "SAS_ROWID_") AND (VARNUM(id, "SAS_TEXTTHREAD_") OR VARNUM(id, "SAS_TEXTPACKAGE_"));' 
+            / '      y = ("DATA"=ATTRC(id, "MTYPE"));'
+            / '      if symexist("DS2force") then z = symgetn("DS2force"); else z = 0;'
+            / '      if (x AND y) OR z then do;' 
+            / '        call execute("proc delete data=' fileshort +(-1) '; run;");' 
+            / "        put 'NOTE# The " fileshort "will be overwritten by the PROC DS2 package/thread from the &packageName. package.';" 
+
+            /*         header for each DS2 packages or threads in PROC DS2 run */
+            / '        call execute("proc ds2;");'
+
+            / '        call execute(''%include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;'');'
+
+            /*         footer for each DS2 packages or threads in PROC DS2 run */
+            / '        call execute("run; quit;");'
+            / '        call execute("options nonotes; proc datasets lib=' DS2lib 'noprint;");'
+            / "        call execute('modify " DS2ds "(label=""Package: &packageName. ; Type: " type "; Name: " fileshort """);');"
+            / '        call execute("run; quit;");'
+            / '      end;'
+            / '      else put "WARNING: Data set ' fileshort 'exist and is not a PROC DS2 package/thread!"' 
+            / '             / "WARNING- PROC DS2 package/thread ' fileshort 'will not be generated..."; '
+            / '      id = CLOSE(id);' 
+            / '    end;' 
+            / '  run;))),'
+            / '%sysfunc(dosubl(%str(options ps=min; title; options msglevel=n nodate notes source nomprint;' 
+            /*  header for each DS2 packages or threads in PROC DS2 run */
+            / ' proc ds2;'
+
+            / ' %include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;'
+
+            /*  footer for each DS2 packages or threads in PROC DS2 run */
+            / ' run; quit;'
+            / ' options nonotes; proc datasets lib=' DS2lib 'noprint;'
+            / "  modify " DS2ds "(label=""Package: &packageName. ; Type: " type "; Name: " fileshort """);"
+            / ' run; quit;'
+            / '))),'
+            / '));'
+            / " " 
+            / ; 
+
+          end;
+
+      end;
+    else 
+      do;
+        /* include the file with the code of the element, all other cases */
        put '  %include' " &_PackageFileref_.(_" folder +(-1) "." file +(-1) ') / nosource2;';
      end;
    
@@ -1471,13 +1586,19 @@ data _null_;
    if upcase(type)=:'FORMAT' then 
      put '  %let cherryPick_FORMAT = %eval(&cherryPick_FORMAT. + 1);';

+    if upcase(type)=:'DS2PCK' then 
+      put '  %let cherryPick_DS2PCK = %eval(&cherryPick_DS2PCK. + 1);';
+
+    if upcase(type)=:'DS2THR' then 
+      put '  %let cherryPick_DS2THR = %eval(&cherryPick_DS2THR. + 1);';
+
    put '%end; ' /; /* Cherry Pick test1 end */


-    /* FOOTERS for IML, FCMP, and PROTO - start */
+    /* FOOTERS for PROC IML, FCMP, and PROTO - start */
    if 1 = LAST.type and upcase(type) in ('FUNCTIONS' 'PROTO' 'FORMATS') then 
      do; /* footer, for multiple functions in one FCMP run, one PROTO run, or one FORMAT run */
-        put "run; " / ;
+        put "quit; " / ;
      end;
    if 1 = LAST.type and upcase(type)='IMLMODULE' then /* footer, for IML modules */
      do;
@@ -1488,47 +1609,47 @@ data _null_;
            '%end;                                  ' / 
            "quit;                                  " / ;
      end;
-    /* FOOTERS for IML, FCMP, and PROTO - end */
+    /* FOOTERS for PROC IML, FCMP, and PROTO - end */

    /* add the link to the functions dataset, only for the first occurrence */
    /*if 1 = isFunction and (upcase(type)=:'FUNCTION') then
      do;
-        put "options APPEND=(cmplib = work.%lowcase(&packageName.fcmp));"/;
+        put "options APPEND=(cmplib = work.%sysfunc(lowcase(&packageName.fcmp)));"/;
      end;*/
    if 1 = FIRST.type and (upcase(type)=:'FUNCTION') then
      do;
        put '%sysfunc(ifc(0<' /
            '  %sysfunc(findw((%sysfunc(getoption(cmplib)))' /
-            "                ,work.%lowcase(&packageName.fcmp),""'( )'"",RIO))" /
-            ',,%str(options' " APPEND=(cmplib = work.%lowcase(&packageName.fcmp));)" /
+            "                ,work.%sysfunc(lowcase(&packageName.fcmp)),""'( )'"",RIO))" /
+            ',,%str(options' " APPEND=(cmplib = work.%sysfunc(lowcase(&packageName.fcmp)));)" /
            '))' ;
      end;

    /* add the link to the proto functions dataset, only for the first occurrence */
    /*if 1 = isProto and (upcase(type)=:'PROTO') then
      do;
-        put "options APPEND=(cmplib = work.%lowcase(&packageName.proto));"/;
+        put "options APPEND=(cmplib = work.%sysfunc(lowcase(&packageName.proto)));"/;
      end;*/
    if 1 = FIRST.type and (upcase(type)=:'PROTO') then
      do;
        put '%sysfunc(ifc(0<' /
            '  %sysfunc(findw((%sysfunc(getoption(cmplib)))' /
-            "                ,work.%lowcase(&packageName.proto),""'( )'"",RIO))" /
-            ',,%str(options' " APPEND=(cmplib = work.%lowcase(&packageName.proto));)" /
+            "                ,work.%sysfunc(lowcase(&packageName.proto)),""'( )'"",RIO))" /
+            ',,%str(options' " APPEND=(cmplib = work.%sysfunc(lowcase(&packageName.proto)));)" /
            '))' ;
      end;

    /* add the link to the formats catalog, only for the first occurrence  */
    /*if 1 = isFormat and (upcase(type)=:'FORMAT') then
      do;
-        put "options INSERT=(fmtsearch = work.%lowcase(&packageName.format));"/;
+        put "options INSERT=(fmtsearch = work.%sysfunc(lowcase(&packageName.format)));"/;
      end;*/
    if 1 = FIRST.type and (upcase(type)=:'FORMAT') then
      do;
        put '%sysfunc(ifc(0<' /
            '  %sysfunc(findw((%sysfunc(getoption(fmtsearch)))' /
-            "                ,work.%lowcase(&packageName.format),""'( )'"",RIO))" /
-            ',,%str(options' " INSERT=(fmtsearch = work.%lowcase(&packageName.format));)" /
+            "                ,work.%sysfunc(lowcase(&packageName.format)),""'( )'"",RIO))" /
+            ',,%str(options' " INSERT=(fmtsearch = work.%sysfunc(lowcase(&packageName.format)));)" /
            '))' ;
      end;

@@ -1576,7 +1697,7 @@ data _null_;
            %end; 
      put +(-1) '`.;''' /
      ' !! ''      %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' /
-      ' !! ''      %put with the SAS Packages Framework version 20240711.;''' / 
+      ' !! ''      %put with the SAS Packages Framework version 20250729.;''' / 
      ' !! ''      %put ****************************************************************************;''' /
      ' !! ''    %GOTO theEndOfTheMacro;''' / 
      ' !! ''    %end;''' ;
@@ -1596,7 +1717,7 @@ data _null_;
  put ' !! ''  %local tmp_NOTES;''                                                                     ';
  put ' !! ''  %let tmp_NOTES = %sysfunc(getoption(NOTES));''                                          ';
  /* the PATH macrovariable will be resolved when the load.sas file is executed */
-  put ' !! "  filename ' "&_PackageFileref_." ' &ZIP. ''&path./' "%lowcase(&packageName.)" '.&zip.'';"';
+  put ' !! "  filename ' "&_PackageFileref_." ' &ZIP. ''&path./' "%sysfunc(lowcase(&packageName.))" '.&zip.'';"';

  /* this loop lists includes for CASLUDFs in the macro definition */
  do until(eof1); /* loopOverTypes1 - start */
@@ -1658,8 +1779,8 @@ data _null_;
    do;
      put '%if 0 = &cherryPick_FCMP. %then %do;';
      put 'options cmplib = (%unquote(%sysfunc(tranwrd(' /
-          '%lowcase(%sysfunc(getoption(cmplib)))' /
-          ',%str(' "work.%lowcase(&packageName.fcmp)" '), %str() ))));';
+          '%sysfunc(lowcase(%sysfunc(getoption(cmplib))))' /
+          ',%str(' "work.%sysfunc(lowcase(&packageName.fcmp))" '), %str() ))));';
      put 'options cmplib = (%unquote(%sysfunc(compress(' /
          '%sysfunc(getoption(cmplib))' /
          ',%str(()) ))));';
@@ -1670,13 +1791,13 @@ data _null_;
    do; 
      put '%if 0 = &cherryPick_PROTO. %then %do;';
      put 'options cmplib = (%unquote(%sysfunc(tranwrd(' /
-          '%lowcase(%sysfunc(getoption(cmplib)))' /
-          ',%str(' "work.%lowcase(&packageName.proto)" '), %str() ))));';
+          '%sysfunc(lowcase(%sysfunc(getoption(cmplib))))' /
+          ',%str(' "work.%sysfunc(lowcase(&packageName.proto))" '), %str() ))));';
      put 'options cmplib = (%unquote(%sysfunc(compress(' /
          '%sysfunc(getoption(cmplib))' /
          ',%str(()) ))));';
      /* proc delete is adde because "empty" PROTO creates dataset too */
-      put "proc delete data=work.%lowcase(&packageName.proto); run;";
+      put "proc delete data=work.&packageName.proto; run;";
      put '%end;';
    end;

@@ -1686,8 +1807,8 @@ data _null_;
    do;
      put '%if 0 = &cherryPick_FORMAT. %then %do;';
      put 'options fmtsearch = (%unquote(%sysfunc(tranwrd(' /
-          '%lowcase(%sysfunc(getoption(fmtsearch)))' /
-          ',%str(' "work.%lowcase(&packageName.)format" '), %str() ))));';
+          '%sysfunc(lowcase(%sysfunc(getoption(fmtsearch))))' /
+          ',%str(' "work.%sysfunc(lowcase(&packageName.))format" '), %str() ))));';
      put 'options fmtsearch = (%unquote(%sysfunc(compress(' /
          '%sysfunc(getoption(fmtsearch))' /
          ', %str(()) ))));';
@@ -1741,14 +1862,14 @@ data _null_;
            %end; 
      put +(-1) '`.; '' !!' /
          '''      %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " ''';                    '' !!' / 
-          '''      %put with the SAS Packages Framework version 20240711.;                                  '' !! ' / 
+          '''      %put with the SAS Packages Framework version 20250729.;                                  '' !! ' / 
          '''      %put ****************************************************************************;       '' !! ' /
          '''    %GOTO theEndOfTheMacro;                                                                    '' !! ' / 
          '''    %end;                                                                                      '' !! ' / 

          '''  %local localSYSmacroName localPackageName i depListNm;                                       '' !! ' / 
          '''  %let localSYSmacroName = &sysmacroname.;                                                     '' !! ' / 
-          '''  %let localSYSmacroName = %LOWCASE(&localSYSmacroName.);                                      '' !! ' / 
+          '''  %let localSYSmacroName = %sysfunc(lowcase(&localSYSmacroName.));                             '' !! ' / 
          '''  %let localPackageName = %substr(&localSYSmacroName.,1,%eval(%length(&localSYSmacroName.)-3));'' !!' / 

          '''  %if %superq(depList) ne %then                                                                '' !!' / 
@@ -1825,12 +1946,12 @@ data _null_;
    isKMF + 1;
    if 1=isKMF then
      do; 
-        put 'data _null_;                                   '
-          / '  call symputX("cherryPick_KMF",      0, "L"); '
-          / 'run;                                           '
-          / "data work.%lowcase(&packageName.kmf);          "
-          / "length member $ 128; call missing(member);     "
-          / "if 0 then output;                              ";
+        put 'data _null_;                               '
+          / '  call symputX("cherryPick_KMF", 0, "L");  '
+          / 'run;                                       '
+          / "data work.&packageName.kmf;                "
+          / "length member $ 128; call missing(member); "
+          / "if 0 then output;                          ";
      end;

    put ' '
@@ -1851,7 +1972,7 @@ data _null_;
      put '%if &cherryPick_KMF. %then %do;';
      put 'filename __KMFgen temp;'
        / 'data _null_;'
-        / "  set work.%lowcase(&packageName.kmf) nobs=nobs;"
+        / "  set work.&packageName.kmf nobs=nobs;"

        / '  call symputX("numberKMF",nobs,"L");'
        / '  file __KMFgen;'
@@ -1883,10 +2004,10 @@ data _null_;
        ;

      put 'data _nulL_;'
-        / '  file "%sysfunc(pathname(WORK))/%lowcase(&packageName..kmf)" termstr=NL lrecl=32767;'
+        / '  file "%sysfunc(pathname(WORK))/%sysfunc(lowcase(&packageName..kmf))" termstr=NL lrecl=32767;'
        / '  putlog "INFO: The &packageName. package provides KMF-abbreviations."; '
        / '  putlog   @7 "By default the file with abbreviations is located in:";'
-        / '  putlog / @9 "%sysfunc(pathname(WORK))/%lowcase(&packageName..kmf)";'
+        / '  putlog / @9 "%sysfunc(pathname(WORK))/%sysfunc(lowcase(&packageName..kmf))";'
        / '  putlog / @7 "To import code abbreviations to your SAS session:";'
        / '  putlog   @7 "- in SAS DMS go to: Tools -> Keyboard Macros -> Macros... -> Import... ";'
        / '  putlog   @7 "- in SAS EG go to: Program -> Manage Macros and Snippets -> Import... ";'
@@ -1894,8 +2015,8 @@ data _null_;

        / '  putlog / @7 "Should you have any problem with finding the file consider moving";'
        / '  putlog   @7 "it to a location of your choice with the help of the following snippet:";'
-        / '  putlog / @7 "  filename KMFin " "''%sysfunc(pathname(WORK))/%lowcase(&packageName..kmf)''" " lrecl=1 recfm=n;";'
-        / '  putlog / @7 "  filename KMFout " "''</directory/of/your/choice>/%lowcase(&packageName..kmf)''" " lrecl=1 recfm=n;";'
+        / '  putlog / @7 "  filename KMFin " "''%sysfunc(pathname(WORK))/%sysfunc(lowcase(&packageName..kmf))''" " lrecl=1 recfm=n;";'
+        / '  putlog / @7 "  filename KMFout " "''</directory/of/your/choice>/%sysfunc(lowcase(&packageName..kmf))''" " lrecl=1 recfm=n;";'
        / '  putlog   @7 ''  %put *%sysfunc(fcopy(KMFin, KMFout))*(0=success)*;'';'
        / '  putlog / "0a"x / " ";'

@@ -1950,7 +2071,7 @@ data _null_;
        / 'filename __KMFgen clear;'
        ;
      put '%end;';
-      put "proc delete data=work.%lowcase(&packageName.kmf); run;";
+      put "proc delete data=work.&packageName.kmf; run;";
      put 'options &temp_noNotes_etc.;';
    end;
  put 'data _null_;';
@@ -1982,7 +2103,7 @@ data _null_;
  put '      end;                                                                                                  ';
  put '      SYSloadedPackages = cats("#", translate(strip(SYSloadedPackages), "#", " "), "#");                    ';

-  put "      indexPCKG = INDEX(lowcase(SYSloadedPackages), '#%lowcase(&packageName.)(');                           ";
+  put "      indexPCKG = INDEX(lowcase(SYSloadedPackages), '#%sysfunc(lowcase(&packageName.))(');                  ";
  put "      if indexPCKG = 0 then                                                                                 ";
  put '         do;                                                                                                ';
  put "          SYSloadedPackages = catx('#', SYSloadedPackages, '&packageName.(&packageVersion.)');              ";
@@ -2178,11 +2299,11 @@ data _null_;
  /* delete the link to the formats catalog */
  if isFormat then
    do;
-      put "proc delete data = work.%lowcase(&packageName.format)(mtype = catalog);";
+      put "proc delete data = work.&packageName.format(mtype = catalog);";
      put 'run;';
      put 'options fmtsearch = (%unquote(%sysfunc(tranwrd(' /
-          '%lowcase(%sysfunc(getoption(fmtsearch)))' /
-          ',%str(' "work.%lowcase(&packageName.)format" '), %str() ))));';
+          '%sysfunc(lowcase(%sysfunc(getoption(fmtsearch))))' /
+          ',%str(' "work.%sysfunc(lowcase(&packageName.))format" '), %str() ))));';
      put 'options fmtsearch = (%unquote(%sysfunc(compress(' /
          '%sysfunc(getoption(fmtsearch))' /
          ', %str(()) ))));';
@@ -2202,11 +2323,11 @@ data _null_;
  /* delete the link to the proto functions dataset */
  if isProto then
    do;
-      put "proc delete data = work.%lowcase(&packageName.proto);";
+      put "proc delete data = work.&packageName.proto;";
      put "run;" /;
      put 'options cmplib = (%unquote(%sysfunc(tranwrd(' /
-          '%lowcase(%sysfunc(getoption(cmplib)))' /
-          ',%str(' "work.%lowcase(&packageName.proto)" '), %str() ))));';
+          '%sysfunc(lowcase(%sysfunc(getoption(cmplib))))' /
+          ',%str(' "work.%sysfunc(lowcase(&packageName.proto))" '), %str() ))));';
      put 'options cmplib = (%unquote(%sysfunc(compress(' /
          '%sysfunc(getoption(cmplib))' /
          ',%str(()) ))));';
@@ -2215,7 +2336,7 @@ data _null_;


  /* delete functions */
-  put "proc fcmp outlib = work.%lowcase(&packageName.fcmp).package;";
+  put "proc fcmp outlib = work.&packageName.fcmp.package;";
  isFunction = 0;
  EOF = 0;
  do until(EOF);
@@ -2232,8 +2353,8 @@ data _null_;
  if isFunction then
    do;
      put 'options cmplib = (%unquote(%sysfunc(tranwrd(' /
-          '%lowcase(%sysfunc(getoption(cmplib)))' /
-          ',%str(' "work.%lowcase(&packageName.fcmp)" '), %str() ))));';
+          '%sysfunc(lowcase(%sysfunc(getoption(cmplib))))' /
+          ',%str(' "work.%sysfunc(lowcase(&packageName.fcmp))" '), %str() ))));';
      put 'options cmplib = (%unquote(%sysfunc(compress(' /
          '%sysfunc(getoption(cmplib))' /
          ',%str(()) ))));';
@@ -2256,15 +2377,33 @@ data _null_;
    /* put 'remove module = ' fileshort ';'; */
  end;
 
-  /* delete datasets */
-  put "proc sql noprint;";
+  /* delete data sets */
+  put "proc SQL noprint;";
  EOF = 0;
  do until(EOF);
    set &filesWithCodes. end = EOF;
-    if not (upcase(type)=:'DATA') then continue;
+    if not (upcase(type) in: ('DATA')) then continue;
    put '%put NOTE- Element of type ' type 'generated from the file "' file +(-1) '" will be deleted;';
    put '%put NOTE- ;';
-    put 'drop table ' fileshort ';' /;
+    put '%sysfunc(ifc(%sysfunc(exist(' fileshort ')),drop table ' fileshort ',));' /;
+  end;
+  put "quit;" /;
+
+  /* delete PROC DS2 packages or threads */
+  put 'data _null_; call symputx("_DS2_2_del_",0,"L"); run;';
+  put "proc SQL noprint;";
+  EOF = 0;
+  do until(EOF);
+    set &filesWithCodes. end = EOF;
+    if not (upcase(type) in: ('DS2PCK' 'DS2THR')) then continue;
+    put '%put NOTE- Element of type ' type 'generated from the file "' file +(-1) '" will be deleted;'
+      / '%put NOTE- ;'
+      / '%let _DS2_2_del_ = %sysfunc(open(' fileshort '));'
+      / '%sysfunc(ifc(&_DS2_2_del_. AND %sysfunc(ATTRC(&_DS2_2_del_.,LABEL))='
+      / '%str(' "Package: &packageName. ; Type: " type "; Name: " fileshort +(-1) '),drop table ' fileshort ',)) '
+      / '%let _DS2_2_del_ = %sysfunc(close(&_DS2_2_del_.));'
+      ;
+    put ';' /; /* this is semicolon closing drop table statement */
  end;
  put "quit;" /;

@@ -2307,7 +2446,7 @@ data _null_;
  put '      end;                                                                                            ';
  put '      SYSloadedPackages = cats("#", translate(strip(SYSloadedPackages), "#", " "), "#");              ';

-  put "      if INDEX(lowcase(SYSloadedPackages), '#%lowcase(&packageName.(&packageVersion.))#') > 0 then    ";
+  put "      if INDEX(lowcase(SYSloadedPackages),'#%sysfunc(lowcase(&packageName.(&packageVersion.)))#')>0 then ";
  put '         do;                                                                                          ';
  put "          SYSloadedPackages = tranwrd(SYSloadedPackages, '#&packageName.(&packageVersion.)#', '##');  ";
  put '          SYSloadedPackages = compbl(translate(SYSloadedPackages, " ", "#"));                         ';
@@ -2392,12 +2531,13 @@ data _null_;

    length fileshort2 $ 256;
    select;
-      when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'",   fileshort, "'" );
-      when (upcase(type) =:  "MACRO"           ) fileshort2 = cats('''%', fileshort, "()'");
+      when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'",   fileshort, "'"   );
+      when (upcase(type) =:  "MACRO"           ) fileshort2 = cats('''%', fileshort, "()'" );
      when (upcase(type) =:  "FUNCTION"        ) fileshort2 = cats("'",   fileshort, "()'" );
      when (upcase(type) =:  "IMLMODULE"       ) fileshort2 = cats("'",   fileshort, "()'" );
      when (upcase(type) =:  "PROTO"           ) fileshort2 = cats("'",   fileshort, "()'" );
      when (upcase(type) =:  "FORMAT"          ) fileshort2 = cats("'$",  fileshort, ".'"  );
+      when (upcase(type) in ('DS2PCK' 'DS2THR')) fileshort2 = cats("'DS2",  fileshort, "'" );
      otherwise fileshort2 = fileshort;
    end;
    strX = catx('/', folder, order, type, file, fileshort, fileshort2);
@@ -2524,12 +2664,12 @@ data _null_;
  %if %superq(additionalContent) NE %then
  %do;
    put 'put ;' / 'put @3 ''Package contains additional content, run:  %loadPackageAddCnt(' "&packageName." ')  to load it'';';
-    put "put @3 'or look for the %lowcase(&packageName.)_AdditionalContent directory in the Packages fileref';";
+    put "put @3 'or look for the %sysfunc(lowcase(&packageName.))_AdditionalContent directory in the Packages fileref';";
    put "put @3 'localization (only if additional content was deployed during the installation process).';" / "put ;";
  %end;

  put 'put " " / @3 "--------------------------------------------------------------------" / " ";' 
-    /       'put @3 "*SAS package generated by SAS Package Framework, version `20240711`*";' 
+    /       'put @3 "*SAS package generated by SAS Package Framework, version `20250729`*";' 
    / 'put " " / @3 "--------------------------------------------------------------------";';

  put 'run;                                                                      ' /;
@@ -2568,13 +2708,14 @@ data _null_;

    length fileshort2 $ 256;
    select;
-      when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'",   fileshort, "'" );
-      when (upcase(type) =:  "MACRO"           ) fileshort2 = cats('''%', fileshort, "()'");
+      when (upcase(type) in ("DATA" "LAZYDATA")) fileshort2 = cats("'",   fileshort, "'"   );
+      when (upcase(type) =:  "MACRO"           ) fileshort2 = cats('''%', fileshort, "()'" );
      when (upcase(type) =:  "FUNCTION"        ) fileshort2 = cats("'",   fileshort, "()'" );
      when (upcase(type) =:  "IMLMODULE"       ) fileshort2 = cats("'",   fileshort, "()'" );
      when (upcase(type) =:  "PROTO"           ) fileshort2 = cats("'",   fileshort, "()'" );
      when (upcase(type) =:  "FORMAT"          ) fileshort2 = cats("'$",  fileshort, ".'"  );
      when (upcase(type) =:  "CASLUDF"         ) fileshort2 = cats("'",   fileshort, "()'" );
+      when (upcase(type) in ('DS2PCK' 'DS2THR')) fileshort2 = cats("'DS2",  fileshort, "'" );
      otherwise fileshort2 = fileshort;
    end;
    strX = catx('/', folder, order, type, file, fileshort, fileshort2);
@@ -2680,7 +2821,7 @@ data _null_;
  if (upcase(type) not in: ('TEST' 'ADDCNT')); /* test files and additional content are not to be copied */

  call execute(cat ('filename _SPFIN_ "', catx('/', base, folder, file), '";'));
-  call execute(cats("filename _SPFOUT_ ZIP '", base, "/%lowcase(&packageName.).zip' member='_", folder, ".", file, "';") );
+  call execute(cats("filename _SPFOUT_ ZIP '", base, "/%sysfunc(lowcase(&packageName.)).zip' member='_", folder, ".", file, "';") );

  /* copy code file into the zip */
  call execute('data _null_;');
@@ -2735,7 +2876,7 @@ data _null_;
      "help           "
    ;
      /* test if "driving" files exist */
-      call execute(cats("filename _SPFOUT_ ZIP '", base, "/%lowcase(&packageName.).zip' member='", drivFile, ".sas';") );
+      call execute(cats("filename _SPFOUT_ ZIP '", base, "/%sysfunc(lowcase(&packageName.)).zip' member='", drivFile, ".sas';") );
      call execute('data _null_;');
      call execute('  pathname = pathname("_SPFIN_");');
      call execute('  ex = fexist("_SPFOUT_");');
@@ -2872,7 +3013,7 @@ filename &zipReferrence. clear;
  %put NOTE- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^;
  %put NOTE-;

-  filename &zipReferrence. "&filesLocation./%lowcase(&packageName.).zip";
+  filename &zipReferrence. "&filesLocation./%sysfunc(lowcase(&packageName.)).zip";
  filename &zipReferrence. list;
  %local notesSourceOptions;
  %let notesSourceOptions = %sysfunc(getoption(notes)) %sysfunc(getoption(source));
@@ -3057,7 +3198,7 @@ run;

 %if %Qupcase(&sascfgFile.) = DEF %then /* the DEF value points to the sasv9.cfg file in the sasroot directory */
  %do;
-    %let SASCONFIG = -config ""&SASROOT./sasv9.cfg"";
+    %let SASCONFIG = -config "&SASROOT./sasv9.cfg";
    %put NOTE: The following SAS config file will be used:;
    %put NOTE- &=SASCONFIG.;
  %end;
@@ -3065,7 +3206,7 @@ run;
  %do;
    %if %sysfunc(fileexist(&sascfgFile.)) %then
      %do;
-        %let SASCONFIG = -config ""&SASCFGFILE."";
+        %let SASCONFIG = -config "&SASCFGFILE.";
        %put NOTE: The following SAS config file will be used:;
        %put NOTE- &=SASCONFIG.;
      %end;
@@ -3082,7 +3223,7 @@ run;
 options DLCREATEDIR; /* turns-on creation of subdirectories by libname */
 /* temporary location for tests results is WORK unless developer provide &testResults. */
 %local testPackageTimesamp;
-%let testPackageTimesamp = %lowcase(&packageName._%sysfunc(datetime(),b8601dt15.));
+%let testPackageTimesamp = %sysfunc(lowcase(&packageName._%sysfunc(datetime(),b8601dt15.)));
 %if %qsysfunc(fileexist(%bquote(&testResults.))) %then
  %do;
    libname TEST "&testResults./test_&testPackageTimesamp.";
@@ -3484,8 +3625,8 @@ options &quotelenmax_tmp.;
 %sysfunc(getoption(notes)) %sysfunc(getoption(source)) msglevel=%sysfunc(getoption(msglevel));
 options NOnotes NOsource msglevel=N;

-filename &zipReferrence. "&filesLocation./%lowcase(&packageName.).md";
-filename &_PackageFileref_. ZIP "&filesLocation./%lowcase(&packageName.).zip";
+filename &zipReferrence. "&filesLocation./%sysfunc(lowcase(&packageName.)).md";
+filename &_PackageFileref_. ZIP "&filesLocation./%sysfunc(lowcase(&packageName.)).zip";

 data &filesWithCodes.markdown;
  /* break if no data */
@@ -3561,12 +3702,12 @@ data &filesWithCodes.markdown;
  %do;
    put "  " / "---" / " ";
    put 'Package contains additional content, run:  `%loadPackageAddCnt(' "&packageName." ')`  to load it'
-      / "or look for the `%lowcase(&packageName.)_AdditionalContent` directory in the `packages` fileref"
+      / "or look for the `%sysfunc(lowcase(&packageName.))_AdditionalContent` directory in the `packages` fileref"
      / "localization (only if additional content was deployed during the installation process).";
  %end;

  put " " / "--------------------------------------------------------------------" / " " 
-          / "*SAS package generated by SAS Package Framework, version `20240711`*" 
+          / "*SAS package generated by SAS Package Framework, version `20250729`*" 
    / " " / "--------------------------------------------------------------------" / " ";

  put "# The `&packageName.` package content";
@@ -3699,9 +3840,9 @@ options &MarkDownOptionsTmp.;
  options NOnotes NOsource;

  /* zip */
-  filename &zipReferrence. "&filesLocation./%lowcase(&packageName.).zip" lrecl=1 recfm=n;
+  filename &zipReferrence. "&filesLocation./%sysfunc(lowcase(&packageName.)).zip" lrecl=1 recfm=n;
  filename &zipReferrence. list;
-  filename &zipReferrenceV. "&filesLocation./%lowcase(&packageName.)_&packageVersion._.zip" lrecl=1 recfm=n;
+  filename &zipReferrenceV. "&filesLocation./%sysfunc(lowcase(&packageName.))_&packageVersion._.zip" lrecl=1 recfm=n;
  filename &zipReferrenceV. list;
  data _null_;
    rc = fcopy("&zipReferrence.", "&zipReferrenceV.");
@@ -3709,18 +3850,18 @@ options &MarkDownOptionsTmp.;
    rctxt = sysmsg();
    if rc then
      do;
-        put "ERROR: An error " rc "occurred during creation of %lowcase(&packageName.)_&packageVersion._.zip file.";
+        put "ERROR: An error " rc "occurred during creation of %sysfunc(lowcase(&packageName.))_&packageVersion._.zip file.";
        put rctxt;
      end;
-    else put "Creating %lowcase(&packageName.)_&packageVersion._.zip file.";
+    else put "Creating %sysfunc(lowcase(&packageName.))_&packageVersion._.zip file.";
  run;
  filename &zipReferrence. clear;
  filename &zipReferrenceV. clear;

  /* md */
-  filename &zipReferrence. "&filesLocation./%lowcase(&packageName.).md" lrecl=1 recfm=n;
+  filename &zipReferrence. "&filesLocation./%sysfunc(lowcase(&packageName.)).md" lrecl=1 recfm=n;
  filename &zipReferrence. list;
-  filename &zipReferrenceV. "&filesLocation./%lowcase(&packageName.)_&packageVersion._.md" lrecl=1 recfm=n;
+  filename &zipReferrenceV. "&filesLocation./%sysfunc(lowcase(&packageName.))_&packageVersion._.md" lrecl=1 recfm=n;
  filename &zipReferrenceV. list;
  data _null_;
    rc = fcopy("&zipReferrence.", "&zipReferrenceV.");
@@ -3728,10 +3869,10 @@ options &MarkDownOptionsTmp.;
    rctxt = sysmsg();
    if rc then
      do;
-        put "ERROR: An error " rc "occurred during creation of %lowcase(&packageName.)_&packageVersion._.md file.";
+        put "ERROR: An error " rc "occurred during creation of %sysfunc(lowcase(&packageName.))_&packageVersion._.md file.";
        put rctxt;
      end; 
-    else put "Creating %lowcase(&packageName.)_&packageVersion._.md file.";
+    else put "Creating %sysfunc(lowcase(&packageName.))_&packageVersion._.md file.";
  run;
  filename &zipReferrence. clear;
  filename &zipReferrenceV. clear;
@@ -3801,7 +3942,7 @@ TODO: (in Polish)

 - weryfikacja srodowiska [ ]

- dodac typ "ds2" [ ]
+- dodac typ "ds2" [v]

 - dodac mozliwosc szyfrowania pliku z pakietem (haslo do zip, sprawdzic istnienie funkcjonalnosci) [ ]

--- a/SPF/Macros/helppackage.sas
+++ b/SPF/Macros/helppackage.sas
@@ -28,7 +28,7 @@
                                        */
 )/secure
 /*** HELP END ***/
-des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage() for help info.'
+des = 'Macro to get help about SAS package, version 20250729. Run %helpPackage() for help info.'
 ;
 %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then
  %do;
@@ -43,7 +43,7 @@ des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage()
    %put ###       This is short help information for the `helpPackage` macro            #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro to get help about SAS packages, version `20240711`                      #;
+    %put # Macro to get help about SAS packages, version `20250729`                      #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -93,6 +93,7 @@ des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage()
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put #### Example ####################################################################;
    %put #                                                                               #;
@@ -120,18 +121,20 @@ des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage()
  %end;

  /* local variables for options */
-  %local ls_tmp ps_tmp notes_tmp source_tmp msglevel_tmp;
+  %local ls_tmp ps_tmp notes_tmp source_tmp msglevel_tmp mautocomploc_tmp;
  %let ls_tmp       = %sysfunc(getoption(ls));
  %let ps_tmp       = %sysfunc(getoption(ps));
  %let notes_tmp    = %sysfunc(getoption(notes));
  %let source_tmp   = %sysfunc(getoption(source));
  %let msglevel_tmp = %sysfunc(getoption(msglevel));
+  %let mautocomploc_tmp = %sysfunc(getoption(mautocomploc));

-  options NOnotes NOsource ls=MAX ps=MAX msglevel=N;
+  options NOnotes NOsource ls=MAX ps=MAX msglevel=N NOmautocomploc;

  %local _PackageFileref_;
-  /* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */
-  data _null_; call symputX("_PackageFileref_", "P" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); run;
+  data _null_; 
+    call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
+  run;

  /* when the packages reference is multi-directory search for the first one containing the package */
  data _null_;
@@ -141,7 +144,7 @@ des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage()
    if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */
    do i = 1 to kcountw(packages, "()", "QS");
      p = dequote(kscanx(packages, i, "()", "QS"));
-      exists + fileexist(catx("/", p, "%lowcase(&packageName.).&zip."));
+      exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip."));
      if exists then leave;
    end;
    if exists then call symputx("path", p, "L");
@@ -149,7 +152,7 @@ des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage()

  filename &_PackageFileref_. &ZIP. 
  /* put location of package myPackageFile.zip here */
-    "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+    "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
  ;
  %if %sysfunc(fexist(&_PackageFileref_.)) %then
    %do;
@@ -157,7 +160,7 @@ des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage()
      filename &_PackageFileref_. clear;
      options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp.;
      filename &_PackageFileref_. &ZIP. 
-        "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+        "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
        ENCODING =
          %if %bquote(&packageEncoding.) NE %then &packageEncoding. ;
                                            %else utf8 ;
@@ -170,7 +173,8 @@ des = 'Macro to get help about SAS package, version 20240711. Run %helpPackage()
  %else %put ERROR:[&sysmacroname] File "&path./&packageName..&zip." does not exist!;
  filename &_PackageFileref_. clear;

-  options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp. msglevel = &msglevel_tmp.;
+  options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp. 
+          msglevel = &msglevel_tmp. &mautocomploc_tmp.;

 %ENDofhelpPackage:
 %mend helpPackage;
--- a/SPF/Macros/installpackage.sas
+++ b/SPF/Macros/installpackage.sas
@@ -1,5 +1,5 @@
 /*+installPackage+*/
-/* Macros to install SAS packages, version 20240711  */
+/* Macros to install SAS packages, version 20250729  */
 /* A SAS package is a zip file containing a group of files
   with SAS code (macros, functions, data steps generating 
   data, etc.) wrapped up together and %INCLUDEed by
@@ -18,11 +18,15 @@
 , URLoptions =  /* options for the `sourcePath` URLs */
 , loadAddCnt=0  /* should the additional content be loaded?
                   default is 0 - means No, 1 means Yes */
+, instDoc=0     /* should the markdown file with documentation be installed?
+                   default is 0 - means No, 1 means Yes */
+, SFRCVN =      /* name of a macro variable to store success-failure return code value */
+, github =      /* name of a user or an organization in GitHub, all characters except [A-z0-9_.-] are compressed */
 )
 /secure
 minoperator 
 /*** HELP END ***/
-des = 'Macro to install SAS package, version 20240711. Run %%installPackage() for help info.'
+des = 'Macro to install SAS package, version 20250729. Run %%installPackage() for help info.'
 ;
 %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then
  %do;
@@ -37,7 +41,7 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
    %put ###       This is short help information for the `installPackage` macro                      #;
    %put #--------------------------------------------------------------------------------------------#;;
    %put #                                                                                            #;
-    %put # Macro to install SAS packages, version `20240711`                                          #;
+    %put # Macro to install SAS packages, version `20250729`                                          #;
    %put #                                                                                            #;
    %put # A SAS package is a zip file containing a group                                             #;
    %put # of SAS codes (macros, functions, data steps generating                                     #;
@@ -70,21 +74,23 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
    %put #                   `https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/`        #;
    %put #                                                                                            #;
    %put # - `mirror=`       Indicates which web location for packages installation is used.          #;
-    %put #                   Value `0` indicates:                                                     #;
-    %put #                   `https://github.com/SASPAC/`                                             #;
+    %put #                   Value `0` or `SASPAC` indicates:                                         #;
+    %put #                    `https://github.com/SASPAC/`                                            #;
    %put #                   Value `1` indicates:                                                     #;
-    %put #                   `https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main`             #;
+    %put #                    `https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main`            #;
    %put #                   Value `2` indicates:                                                     #;
-    %put #                   `https://pages.mini.pw.edu.pl/~jablonskib/SASpublic/SAS_PACKAGES`        #;
+    %put #                    `https://pages.mini.pw.edu.pl/~jablonskib/SASpublic/SAS_PACKAGES`       #;
+    %put #                   Value `3` or `PharmaForest` indicates:                                   #;
+    %put #                    `https://github.com/PharmaForest/`                                      #;
    %put #                   Default value is `0`.                                                    #;
    %put #                                                                                            #;
    %put # - `version=`      Indicates which historical version of a package to install.              #;
-    %put #                   Historical version are available only if `mirror=0` is set.              #;
+    %put #                   Historical version are currently available only if `mirror=0` is set.    #;
    %put #                   Default value is null which means "install the latest".                  #;
-    %put #                   When there are multiple packages to install version                      #;
+    %put #                   When there are multiple packages to install the `version` variable       #;
    %put #                   is scan sequentially.                                                    #;
    %put #                                                                                            #;
-    %put # - `replace=`      With default value of `1` it causes existing package file                #;
+    %put # - `replace=`      With default value of `1`, it causes existing package file 0             #;
    %put #                   to be replaced by new downloaded file.                                   #;
    %put #                                                                                            #;
    %put # - `URLuser=`      A user name for the password protected URLs, no quotes needed.           #;
@@ -101,10 +107,26 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
    %put #                   directory in `<packageName>_AdditionalContent` folder.                   #;
    %put #                   For other locations use `%nrstr(%%loadPackageAddCnt())` macro.                    #;
    %put #                                                                                            #;
+    %put # - `instDoc=`      *Optional.* A package may be provided with a markdown file               #;
+    %put #                   containing combined documentation of the package. The option             #;
+    %put #                   indicates if the `.md` file should be also downloaded.                   #;
+    %put #                   Default value of zero (`0`) means "No", one (`1`) means "Yes".           #;
+    %put #                                                                                            #;
+    %put # - `SFRCVN=`       *Optional.* Provides a NAME for a macro variable to store value of the   #;
+    %put #                   *success-failure return code* of the installation process. Return value  #;
+    %put #                   has the following form: `<number of successes>.<number of failures>`     #;
+    %put #                   The macro variable is created as a *global* macro variable.              #;
+    %put #                                                                                            #;
+    %put #  - `github=`      *Optional.* A name of a user or an organization in GitHub.               #;
+    %put #                   Allows an easy set of the search path for packages available on GitHub:  #;
+    %put #                    `https://github.com/<github>/<packagename>/raw/.../`                    #;
+    %put #                   All characters except `[A-z0-9_.-]` are compressed.                      #;
+    %put #                                                                                            #;
    %put #--------------------------------------------------------------------------------------------#;
    %put #                                                                                            #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`                #;
    %put # to learn more.                                                                             #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`                        #;
    %put #                                                                                            #;
    %put #### Example #################################################################################;
    %put #                                                                                            #;
@@ -129,7 +151,7 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
    %put #                                                                                            #;
    %put #   Enabling the SAS Package Framework                                                       #;
    %put #   from the local directory and installing & loading                                        #;
-    %put #   the multiple packages from the Internet.                                                 #; 
+    %put #   multiple packages with versions from the Internet.                                       #; 
    %put #                                                                                            #;
    %put #   Assume that the `SPFinit.sas` file                                                       #;
    %put #   is located in the "C:/SAS_PACKAGES/" folder.                                             #;
@@ -149,7 +171,7 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
  %end;

  /* local variables for options */ 
-  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp;
+  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp mautocomploc_tmp;

  %let ls_tmp         = %sysfunc(getoption(ls));
  %let ps_tmp         = %sysfunc(getoption(ps));
@@ -158,8 +180,9 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
  %let stimer_tmp     = %sysfunc(getoption(stimer));
  %let fullstimer_tmp = %sysfunc(getoption(fullstimer));
  %let msglevel_tmp   = %sysfunc(getoption(msglevel));
+  %let mautocomploc_tmp = %sysfunc(getoption(mautocomploc));

-  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N;
+  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc;

  /*
  Reference:
@@ -175,40 +198,83 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
      call symputX("firstPackagesPath", pathname("packages"), "L");
  run;

+  %let loadAddCnt = %sysevalf(NOT(0=%superq(loadAddCnt)));
+  %let instDoc    = %sysevalf(NOT(0=%superq(instDoc)));
+  
+  %let replace    = %sysevalf(1=%superq(replace));
+
  %if %superq(sourcePath)= %then
    %do;
-      %local SPFinitMirror;
+      %local SPFinitMirror SPFinitMirrorMD;
      /* the defaults are: */
-      %let SPFinitMirror = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
+      %let SPFinitMirror   = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
+      %let SPFinitMirrorMD = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.md;
      %let sourcePath = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/packages/;

+      %if %qupcase(%superq(mirror))=SASPAC       %then %let mirror = 0;
+      %if %qupcase(%superq(mirror))=PHARMAFOREST %then %let mirror = 3;
+      %if %superq(github) NE                     %then %let mirror = 4;
+      
+      %if NOT (%superq(mirror) IN (0 1 2 3 4)) %then 
+        %do;
+          %put WARNING: Unknown mirror: %superq(mirror)!;
+          %put WARNING- Default will be used.;
+          %let mirror = 0;
+        %end;
+
      %if 0 = %superq(mirror) %then
        %do;
-          %let SPFinitMirror = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
-          %let sourcePath = https://github.com/SASPAC/; /*usercontent*/
+          %let SPFinitMirror   = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
+          %let SPFinitMirrorMD = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.md;
+          %let sourcePath = https://github.com/SASPAC/; /*users content*/
          %goto mirrorEnd;
        %end;

      %if 1 = %superq(mirror) %then
        %do;
-          %let SPFinitMirror = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
+          %let SPFinitMirror   = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
+          %let SPFinitMirrorMD = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.md;
          %let sourcePath = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/packages/;
          %goto mirrorEnd;
        %end;
      
      %if 2 = %superq(mirror) %then
        %do;
-          %let SPFinitMirror = https://pages.mini.pw.edu.pl/~jablonskib/SASpublic/SAS_PACKAGES/SPF/SPFinit.sas;
+          %let SPFinitMirror   = https://pages.mini.pw.edu.pl/~jablonskib/SASpublic/SAS_PACKAGES/SPF/SPFinit.sas;
+          %let SPFinitMirrorMD = https://pages.mini.pw.edu.pl/~jablonskib/SASpublic/SAS_PACKAGES/SPF/SPFinit.md;
          %let sourcePath = https://pages.mini.pw.edu.pl/~jablonskib/SASpublic/SAS_PACKAGES/packages/;
          %goto mirrorEnd;
        %end;
+
+      %if 3 = %superq(mirror) %then
+        %do;
+          %let SPFinitMirror   = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
+          %let SPFinitMirrorMD = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.md;
+          /* ingnore version support for pharmaForest for now */
+          %let sourcePath = https://github.com/PharmaForest/; /*users content*/
+          %goto mirrorEnd;
+        %end;
+
+      %if 4 = %superq(mirror) %then
+        %do;
+          %let SPFinitMirror   = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.sas;
+          %let SPFinitMirrorMD = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/main/SPF/SPFinit.md;
+          /* ingnore version support for pharmaForest for now */
+          %let github = %sysfunc(compress(%superq(github),%str(,.-),KAD));
+          %put INFO: GitHub location used is: %superq(github).;
+          %let sourcePath = https://github.com/&github./; /*users content*/
+          %goto mirrorEnd;
+        %end;
+
      %mirrorEnd:
      %put INFO: Source path is &sourcePath.;
    %end;
  %else
    %do;
+      %let sourcePath = %sysfunc(dequote(%superq(sourcePath)))/;
      %let mirror=-1;
-      %let SPFinitMirror = &sourcePath.SPFinit.sas;
+      %let SPFinitMirror   = &sourcePath.SPFinit.sas;
+      %let SPFinitMirrorMD = &sourcePath.SPFinit.md;
    %end;

  %local i str;
@@ -225,7 +291,7 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
  
  %if %length("%sysfunc(compress(%superq(str),[,k))") NE %length("%sysfunc(compress(%superq(str),],k))") %then
    %do;
-      %put ERROR: Syntax error in list of packages!;
+      %put ERROR: Syntax error in the provided list of packages!;
      %put ERROR- %superq(packagesNames);
      %goto packagesListError;
    %end;
@@ -233,6 +299,10 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
  %put ;
  %put INFO: Calling: &packagesNames.;
  
+  %Local PackagesInstalledSussess PackagesInstalledFail;
+  %Let PackagesInstalledSussess=;
+  %let PackagesInstalledFail=;
+
  %do i = 1 %to %sysfunc(countw(&packagesNames., , S));
  /*-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-*/
    %local packageName packageSubDir vers versA versB;
@@ -244,17 +314,20 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
    %let vers=;
    %if %superq(versB) ne %then %let vers = &versB.;
    %if %superq(versA) ne %then %let vers = &versA.;
-    %if -1 = &mirror %then /* ignore version when direct path is provided */
+    %if %eval(-1 = &mirror) OR %eval(3 = &mirror) %then /* ignore version when direct path or PharmaForest is provided */
      %do;
        %let vers=;
      %end;
    %put ### &packageName.(&vers.) ###;
    
-    %put *** %lowcase(&packageName.) start *****************************************;
-    %local in out _IOFileref_;
-    data _null_; call symputX("_IOFileref_", put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); run;
+    %put *** %sysfunc(lowcase(&packageName.)) start *****************************************;
+    %local in out inMD outMD _IOFileref_;
+    data _null_; call symputX("_IOFileref_", put(MD5(lowcase("&packageName.")), hex7. -L), "L"); run;
    %let  in = i&_IOFileref_.;
    %let out = o&_IOFileref_.;
+    %let  inMD = j&_IOFileref_.;
+    %let outMD = u&_IOFileref_.;
+
    /* %let  in = i%sysfunc(md5(&packageName.),hex7.); */
    /* %let out = o%sysfunc(md5(&packageName.),hex7.); */

@@ -264,29 +337,48 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
        /* allows to install/download the framework file like any other package */
        %if %superq(mirror) in (0 1) AND (%superq(vers) ne) %then
          %do;
-            %let SPFinitMirror = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/&vers./SPF/SPFinit.sas;
+            %let SPFinitMirror   = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/&vers./SPF/SPFinit.sas;
+            %let SPFinitMirrorMD = https://raw.githubusercontent.com/yabwon/SAS_PACKAGES/&vers./SPF/SPFinit.md;
          %end;
-        
-        filename &in URL 
+        %if %superq(mirror) > 1 %then
+          %put %str( )Mirror %superq(mirror) does not support versioning.;
+ 
+        /* source code file */
+        filename &in. URL 
          "&SPFinitMirror." 
          recfm=N lrecl=1;
-        filename &out    
+        filename &out.    
          "&firstPackagesPath./SPFinit.sas" 
          recfm=N lrecl=1;
+         
+        /* documentation MD file */ 
+        filename &inMD. URL 
+          "&SPFinitMirrorMD." 
+          recfm=N lrecl=1;
+        filename &outMD.    
+          "&firstPackagesPath./SPFinit.md" 
+          recfm=N lrecl=1;
      %end;
    %else
      %do;
-        %if 0 = %superq(mirror) %then
+        %if %superq(mirror) IN (0 3 4) %then /* SASPAC or PharmaForest or an arbitrary GitHub repo */
          %do;
-            %let packageSubDir = %lowcase(&packageName.)/raw/main/;
+            %let packageSubDir = %sysfunc(lowcase(&packageName.))/raw/main/;
            
            %if %superq(vers) ne %then
              %do;
-                /*%let packageSubDir = %lowcase(&packageName.)/main/hist/&version./;*/
-                %let packageSubDir = %lowcase(&packageName.)/raw/&vers./;
+                /*%let packageSubDir = %sysfunc(lowcase(&packageName.))/main/hist/&version./;*/
+                %let packageSubDir = %sysfunc(lowcase(&packageName.))/raw/&vers./;
              %end;
          %end;
-        filename &in URL "&sourcePath.&packageSubDir.%lowcase(&packageName.).zip" 
+        %else
+          %do;
+            %if %superq(mirror) NE 0 %then
+              %put %str( )Mirror %superq(mirror) does not support versioning.;
+          %end;
+
+        /* zip */
+        filename &in. URL "&sourcePath.&packageSubDir.%sysfunc(lowcase(&packageName.)).zip" 
        %if (%superq(URLuser) ne ) %then
          %do;
            user = "&URLuser."
@@ -294,7 +386,17 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
          %end;
        &URLoptions.
        recfm=N lrecl=1;
-        filename &out    "&firstPackagesPath./%lowcase(&packageName.).zip" recfm=N lrecl=1;
+        filename &out. "&firstPackagesPath./%sysfunc(lowcase(&packageName.)).zip" recfm=N lrecl=1;
+        /* markdown */
+        filename &inMD. URL "&sourcePath.&packageSubDir.%sysfunc(lowcase(&packageName.)).md" 
+        %if (%superq(URLuser) ne ) %then
+          %do;
+            user = "&URLuser."
+            pass = "&URLuser."
+          %end;
+        &URLoptions.
+        recfm=N lrecl=1;
+        filename &outMD. "&firstPackagesPath./%sysfunc(lowcase(&packageName.)).md" recfm=N lrecl=1;
      %end;
    /*
    filename in  list;
@@ -304,12 +406,21 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
    %local installationRC;
    %let installationRC=1;
    data _null_;
-      length filein 8 out_path in_path $ 4096;
+      length filein fileinMD 8 
+        out_path in_path out_pathMD in_pathMD rcTXT $ 4096
+        out_ref in_ref out_refMD in_refMD $ 8
+      ;
      out_path = pathname ("&out");
       in_path = pathname ("&in" );
+      out_pathMD = pathname ("&outMD");
+       in_pathMD = pathname ("&inMD" );
+      out_ref = symget ("out");
+       in_ref = symget ("in" );
+      out_refMD = symget ("outMD");
+       in_refMD = symget ("inMD" );
+      rcTXT=' ';

-
-      filein = fopen( "&in", 'S', 1, 'B');
+      filein = fopen(in_ref, 'S', 1, 'B');
      if filein = 0 then
        put "ERROR: Source file:" / 
            "ERROR- " in_path /
@@ -329,21 +440,23 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
      rc = FCLOSE(filein);
      put;

-      if FEXIST("&out") = 0 then 
+      if FEXIST(out_ref) = 0 then 
        do;
          put @2 "Installing the &packageName. package" 
            / @2 "in the &firstPackagesPath. directory.";
-          rc = FCOPY("&in", "&out");
+          rc = FCOPY(in_ref, out_ref);
+          rcTXT=sysmsg();
        end;
-      else if FEXIST("&out") = 1 then 
+      else if FEXIST(out_ref) = 1 then 
        do;
          if symgetn("replace")=1 then
            do;
              put @2 "The following file will be replaced during "
                / @2 "installation of the &packageName. package: " 
                / @5 out_path;
-              rc = FDELETE("&out");
-              rc = FCOPY("&in", "&out");
+              rc = FDELETE(out_ref);
+              rc = FCOPY(in_ref, out_ref);
+              rcTXT=sysmsg();
            end;
          else
            do;
@@ -352,13 +465,56 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
              rc = 1;
            end;
        end;
-        
-      put @2 "Done with return code " rc= "(zero = success)";
+      put @2 "Done with return code " rc= "(zero = success)" / rcTXT;
      call symputX("installationRC", rc, "L");
+
+      /* try to install documentation file */
+      if 1=symgetn("instDoc") then
+        do;
+          fileinMD = fopen(in_refMD, 'S', 1, 'B');
+          rcMD = FCLOSE(fileinMD);
+
+          if fileinMD then 
+            do;
+              if 0=FEXIST(out_refMD) then 
+                do;
+                  rcMD = FCOPY(in_refMD, out_refMD);
+                  if rcMD=0 then
+                    put @2 "Package documentation installed on request." ; /* / out_pathMD / in_pathMD; */
+                end;
+              else if 1=FEXIST(out_refMD) and 1=symgetn("replace") then
+                do;
+                  rcMD = FDELETE(out_refMD);
+                  if rcMD=0 then
+                    rcMD2 = FCOPY(in_refMD, out_refMD);
+                  if rcMD=0 AND rcMD2=0 then
+                    put @2 "Package documentation installed on demand." ; /* / out_pathMD / in_pathMD; */
+                end;
+            end;
+          else 
+            put @2 "Package documentation in markdown format not available." ; /* / out_pathMD / in_pathMD;*/
+        end;
    run;
     
-    filename &in  clear;
-    filename &out clear;
+    filename &in.  clear;
+    filename &out. clear;
+    filename &inMD.  clear;
+    filename &outMD. clear;
+
+    %if 0 = &installationRC. %then
+      %do;
+        %if %superq(vers)= %then
+          %Let PackagesInstalledSussess=&PackagesInstalledSussess. &packageName.;
+        %else
+          %Let PackagesInstalledSussess=&PackagesInstalledSussess. &packageName.(&vers.);
+      %end;
+    %else
+      %do;
+        %if %superq(vers)= %then
+          %Let PackagesInstalledFail=&PackagesInstalledFail. &packageName.;
+        %else
+          %let PackagesInstalledFail=&PackagesInstalledFail. &packageName.(&vers.);
+      %end;

    %if 1 = &loadAddCnt. 
        AND 0 = &installationRC. 
@@ -372,17 +528,63 @@ des = 'Macro to install SAS package, version 20240711. Run %%installPackage() fo
                           )
        %put - Additional content loading - End -;
      %end;
-    %put *** %lowcase(&packageName.) end *******************************************;
+    %put *** %sysfunc(lowcase(&packageName.)) end *******************************************;
  /*-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-*/
  %end;
+  
+
+  %local sucsCount sucsCountWords;
+  %let sucsCount=0;
+  %if NOT(%superq(PackagesInstalledSussess)=) %then
+    %do;
+      %put %str( );
+      %let sucsCount=%sysfunc(countw(%superq(PackagesInstalledSussess),%str( )));
+      %if 1=&sucsCount. %then
+        %put INFO: Package %superq(PackagesInstalledSussess) installed.;
+      %else %if 1<&sucsCount. %then
+        %do;
+          %let sucsCountWords=%sysfunc(abs(&sucsCount.),words.);
+          %put INFO: Successfully installed &sucsCountWords. packages:;
+          %put %str(      )&PackagesInstalledSussess.;
+        %end;
+    %end;
+
+  %local failCount failCountWords;
+  %let failCount=0;
+  %if NOT(%superq(PackagesInstalledFail)=) %then
+    %do;
+      %put %str( );
+      %let failCount=%sysfunc(countw(%superq(PackagesInstalledFail),%str( )));
+      %if 1=&failCount. %then
+        %put WARNING: Failed to install %superq(PackagesInstalledFail) package.;
+      %else %if 1<&failCount. %then
+        %do;
+          %let failCountWords=%sysfunc(abs(&failCount.),words.);
+          %put WARNING: Failed to install &failCountWords. packages:;
+          %put WARNING- &PackagesInstalledFail.;
+        %end;
+    %end;
+  %put %str( );
+
+  %if NOT(%superq(SFRCVN)=) %then
+    %do;
+      data _null_;
+        length SFRCVN $ 32;
+        SFRCVN = compress(symget('SFRCVN'),"_","KAD");
+        value = "&sucsCount..&failCount.";
+        put 'INFO: Success-Failure-Return-Code macroVariable Name is: ' SFRCVN
+          / '      with value: ' value 
+          / ;
+        call symputX(SFRCVN, value, "G");
+      run;
+    %end;

  %packagesListError:
  
  options ls = &ls_tmp. ps = &ps_tmp. 
          &notes_tmp. &source_tmp. 
          &stimer_tmp. &fullstimer_tmp.
-          msglevel=&msglevel_tmp.;
-
+          msglevel=&msglevel_tmp. &mautocomploc_tmp.;
 %ENDofinstallPackage:
 %mend installPackage;

--- a/SPF/Macros/listpackages.sas
+++ b/SPF/Macros/listpackages.sas
@@ -3,7 +3,7 @@

  Macro to list SAS packages in packages folder. 

-  Version 20240711 
+  Version 20250729 

  A SAS package is a zip file containing a group 
  of SAS codes (macros, functions, data steps generating 
@@ -21,8 +21,9 @@
 *//*** HELP END ***/


-%macro listPackages()/secure PARMBUFF
-des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20240711.'
+%macro listPackages()
+/secure PARMBUFF
+des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20250729.'
 ;
 %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then
  %do;
@@ -37,7 +38,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE
    %put ###       This is short help information for the `listPackages` macro                     #;
    %put #-----------------------------------------------------------------------------------------#;;
    %put #                                                                                         #;
-    %put # Macro to list available SAS packages, version `20240711`                                #;
+    %put # Macro to list available SAS packages, version `20250729`                                #;
    %put #                                                                                         #;
    %put # A SAS package is a zip file containing a group                                          #;
    %put # of SAS codes (macros, functions, data steps generating                                  #;
@@ -56,6 +57,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE
    %put #                                                                                         #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`             #;
    %put # to learn more.                                                                          #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`                     #;
    %put #                                                                                         #;
    %put #### Example ##############################################################################;
    %put #                                                                                         #;
--- a/SPF/Macros/loadpackage.sas
+++ b/SPF/Macros/loadpackage.sas
@@ -30,11 +30,13 @@
 , loadAddCnt=0                        /* should the additional content be loaded?
                                         default is 0 - means No, 1 means Yes */
 , suppressExec=0                      /* indicates if loading of exec files 
-                                         should be suppressed, 1=suppress 
+                                         should be suppressed, 1=suppress */
+, DS2force=0                          /* indicates if PROC DS2 packages and threads
+                                         should be loaded if a data set exists, 0=do not load
                                       */
 )/secure
 /*** HELP END ***/
-des = 'Macro to load SAS package, version 20240711. Run %loadPackage() for help info.'
+des = 'Macro to load SAS package, version 20250729. Run %loadPackage() for help info.'
 minoperator
 ;
 %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then
@@ -50,7 +52,7 @@ minoperator
    %put ###      This is short help information for the `loadPackage` macro             #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro to *load* SAS packages, version `20240711`                              #;
+    %put # Macro to *load* SAS packages, version `20250729`                              #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -110,10 +112,15 @@ minoperator
    %put #                       should be suppressed, default value is `0`,             #;
    %put #                       when set to `1` `exec` files are *not* loaded           #;
    %put #                                                                               #;
+    %put # - `DS2force=`         *Optional.* Indicates if loading of `PROC DS2` packages #;
+    %put #                       or threads should overwrite existing SAS data sets.     #;
+    %put #                       Default value of `0` means "do not overwrite".          #;
+    %put #                                                                               #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put ### Example 1 ###################################################################;
    %put #                                                                               #;
@@ -159,7 +166,7 @@ minoperator
    %GOTO ENDofloadPackage;
  %end;
  /* local variables for options */
-  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp;
+  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp mautocomploc_tmp;
  %let ls_tmp         = %sysfunc(getoption(ls));
  %let ps_tmp         = %sysfunc(getoption(ps));
  %let notes_tmp      = %sysfunc(getoption(notes));
@@ -167,12 +174,14 @@ minoperator
  %let stimer_tmp     = %sysfunc(getoption(stimer));
  %let fullstimer_tmp = %sysfunc(getoption(fullstimer));
  %let msglevel_tmp   = %sysfunc(getoption(msglevel));
+  %let mautocomploc_tmp = %sysfunc(getoption(mautocomploc));

-  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N;
+  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc;

  %local _PackageFileref_;
-  /* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */
-  data _null_; call symputX("_PackageFileref_", "P" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); run;
+  data _null_; 
+    call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
+  run;

  /* when the packages reference is multi-directory search for the first one containing the package */
  data _null_;
@@ -182,7 +191,7 @@ minoperator
    if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */
    do i = 1 to kcountw(packages, "()", "QS");
      p = dequote(kscanx(packages, i, "()", "QS"));
-      exists + fileexist(catx("/", p, "%lowcase(&packageName.).&zip."));
+      exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip."));
      if exists then leave;
    end;
    if exists then call symputx("path", p, "L");
@@ -211,9 +220,14 @@ minoperator
      %let suppressExec = 0;
    %end;

+  %if %superq(DS2force) NE 1 %then
+    %do;
+      %let DS2force = 0;
+    %end;
+
  filename &_PackageFileref_. &ZIP. 
  /* put location of package myPackageFile.zip here */
-    "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+    "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
  ;
  %if %sysfunc(fexist(&_PackageFileref_.)) %then
    %do;
@@ -221,21 +235,31 @@ minoperator
      filename &_PackageFileref_. clear;

      /* test if required version of package is "good enough" */
-      %local rV pV;
-      %let pV = %sysfunc(compress(&packageVersion.,.,kd));
-      %let pV = %sysevalf((%scan(&pV.,1,.,M)+0)*1e8
-                        + (%scan(&pV.,2,.,M)+0)*1e4
-                        + (%scan(&pV.,3,.,M)+0)*1e0);
-      %let rV = %sysfunc(compress(&requiredVersion.,.,kd));
-      %let rV = %sysevalf((%scan(&rV.,1,.,M)+0)*1e8
-                        + (%scan(&rV.,2,.,M)+0)*1e4
-                        + (%scan(&rV.,3,.,M)+0)*1e0);
+      %local rV pV rV0 pV0 rVsign;
+      %let pV0 = %sysfunc(compress(&packageVersion.,.,kd));
+      %let pV = %sysevalf((%scan(&pV0.,1,.,M)+0)*1e8
+                        + (%scan(&pV0.,2,.,M)+0)*1e4
+                        + (%scan(&pV0.,3,.,M)+0)*1e0);
+
+      %let rV0 = %sysfunc(compress(&requiredVersion.,.,kd));
+      %let rVsign = %sysfunc(compress(&requiredVersion.,<=>,k));
+      %if %superq(rVsign)= %then %let rVsign=<=;
+      %else %if NOT (%superq(rVsign) IN (%str(=) %str(<=) %str(=<) %str(=>) %str(>=) %str(<) %str(>))) %then 
+        %do;
+          %put WARNING: Illegal operatopr "%superq(rVsign)"! Default(<=) will be used.;
+          %put WARNING- Supported operators are: %str(= <= =< => >= < >);
+          %let rVsign=<=;
+        %end;
+      %let rV = %sysevalf((%scan(&rV0.,1,.,M)+0)*1e8
+                        + (%scan(&rV0.,2,.,M)+0)*1e4
+                        + (%scan(&rV0.,3,.,M)+0)*1e0);
      
-      %if %sysevalf(&rV. > &pV.) %then
+      %if NOT %sysevalf(&rV. &rVsign. &pV.) %then
        %do;
          %put ERROR: Package &packageName. will not be loaded!;
-          %put ERROR- Required version is &requiredVersion.;
-          %put ERROR- Provided version is &packageVersion.;
+          %put ERROR- Required version is &rV0.;
+          %put ERROR- Provided version is &pV0.;
+          %put ERROR- Condition %bquote((&rV0. &rVsign. &pV0.)) evaluates to %sysevalf(&rV. &rVsign. &pV.);
          %put ERROR- Verify installed version of the package.;
          %put ERROR- ;
          %GOTO WrongVersionOFPackage; /*%RETURN;*/
@@ -243,7 +267,7 @@ minoperator

      options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp.;
      filename &_PackageFileref_. &ZIP. 
-        "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+        "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
        ENCODING =
          %if %bquote(&packageEncoding.) NE %then &packageEncoding. ;
                                            %else utf8 ;
@@ -278,7 +302,7 @@ minoperator
  options ls = &ls_tmp. ps = &ps_tmp. 
          &notes_tmp. &source_tmp. 
          &stimer_tmp. &fullstimer_tmp.
-          msglevel=&msglevel_tmp.;
+          msglevel=&msglevel_tmp. &mautocomploc_tmp.;

 %ENDofloadPackage:
 %mend loadPackage;
--- a/SPF/Macros/loadpackageaddcnt.sas
+++ b/SPF/Macros/loadpackageaddcnt.sas
@@ -19,7 +19,7 @@
                                         is provided in required version */
 )/secure 
 /*** HELP END ***/
-des = 'Macro to load additional content for a SAS package, version 20240711. Run %loadPackageAddCnt() for help info.'
+des = 'Macro to load additional content for a SAS package, version 20250729. Run %loadPackageAddCnt() for help info.'
 minoperator
 ;
 %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then
@@ -35,7 +35,7 @@ minoperator
    %put ###      This is short help information for the `loadPackageAddCnt` macro       #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro to *load* additional content for a SAS package, version `20240711`      #;
+    %put # Macro to *load* additional content for a SAS package, version `20250729`      #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -75,6 +75,7 @@ minoperator
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put ### Example 1 ###################################################################;
    %put #                                                                               #;
@@ -100,7 +101,7 @@ minoperator
    %GOTO ENDofloadPackageAddCnt;
  %end;
  /* local variables for options */
-  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp zip;
+  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp mautocomploc_tmp zip;
  %let ls_tmp         = %sysfunc(getoption(ls));
  %let ps_tmp         = %sysfunc(getoption(ps));
  %let notes_tmp      = %sysfunc(getoption(notes));
@@ -108,16 +109,16 @@ minoperator
  %let stimer_tmp     = %sysfunc(getoption(stimer));
  %let fullstimer_tmp = %sysfunc(getoption(fullstimer));
  %let msglevel_tmp   = %sysfunc(getoption(msglevel));
+  %let mautocomploc_tmp = %sysfunc(getoption(mautocomploc));

  %let zip = zip;

-  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N;
+  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc;

  %local _PackageFileref_;
-  /* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */
  data _null_; 
-    call symputX("_PackageFileref_", "A" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); 
-    call symputX("_TargetFileref_",  "T" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); 
+    call symputX("_PackageFileref_", "A" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
+    call symputX("_TargetFileref_",  "T" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
  run;

  /* when the packages reference is multi-directory search for the first one containing the package */
@@ -128,7 +129,7 @@ minoperator
    if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */
    do i = 1 to kcountw(packages, "()", "QS");
      p = dequote(kscanx(packages, i, "()", "QS"));
-      exists + fileexist(catx("/", p, "%lowcase(&packageName.).&zip."));
+      exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip."));
      if exists then leave;
    end;
    if exists then call symputx("path", p, "L");
@@ -136,14 +137,14 @@ minoperator
  
  filename &_PackageFileref_. &ZIP. 
  /* put location of package myPackageFile.zip here */
-    "&path./%lowcase(&packageName.).&zip."
+    "&path./%sysfunc(lowcase(&packageName.)).&zip."
  ;
  %if %sysfunc(fexist(&_PackageFileref_.)) %then
    %do;

      filename &_PackageFileref_. &ZIP. 
      /* check existence of addcnt.zip inside package */
-        "&path./%lowcase(&packageName.).&zip."
+        "&path./%sysfunc(lowcase(&packageName.)).&zip."
        member='addcnt.zip'
      ;
      %if %sysfunc(fexist(&_PackageFileref_.)) %then
@@ -151,27 +152,38 @@ minoperator

          /* get metadata */
          filename &_PackageFileref_. &ZIP. 
-            "&path./%lowcase(&packageName.).&zip."
+            "&path./%sysfunc(lowcase(&packageName.)).&zip."
          ;
          %include &_PackageFileref_.(packagemetadata.sas) / &source2.;
          filename &_PackageFileref_. clear;

+
          /* test if required version of package is "good enough" */
-          %local rV pV;
-          %let pV = %sysfunc(compress(&packageVersion.,.,kd));
-          %let pV = %sysevalf((%scan(&pV.,1,.,M)+0)*1e8
-                            + (%scan(&pV.,2,.,M)+0)*1e4
-                            + (%scan(&pV.,3,.,M)+0)*1e0);
-          %let rV = %sysfunc(compress(&requiredVersion.,.,kd));
-          %let rV = %sysevalf((%scan(&rV.,1,.,M)+0)*1e8
-                            + (%scan(&rV.,2,.,M)+0)*1e4
-                            + (%scan(&rV.,3,.,M)+0)*1e0);
+          %local rV pV rV0 pV0 rVsign;
+          %let pV0 = %sysfunc(compress(&packageVersion.,.,kd));
+          %let pV = %sysevalf((%scan(&pV0.,1,.,M)+0)*1e8
+                            + (%scan(&pV0.,2,.,M)+0)*1e4
+                            + (%scan(&pV0.,3,.,M)+0)*1e0);
+
+          %let rV0 = %sysfunc(compress(&requiredVersion.,.,kd));
+          %let rVsign = %sysfunc(compress(&requiredVersion.,<=>,k));
+          %if %superq(rVsign)= %then %let rVsign=<=;
+          %else %if NOT (%superq(rVsign) IN (%str(=) %str(<=) %str(=<) %str(=>) %str(>=) %str(<) %str(>))) %then 
+            %do;
+              %put WARNING: Illegal operatopr "%superq(rVsign)"! Default(<=) will be used.;
+              %put WARNING- Supported operators are: %str(= <= =< => >= < >);
+              %let rVsign=<=;
+            %end;
+          %let rV = %sysevalf((%scan(&rV0.,1,.,M)+0)*1e8
+                            + (%scan(&rV0.,2,.,M)+0)*1e4
+                            + (%scan(&rV0.,3,.,M)+0)*1e0);
          
-          %if %sysevalf(&rV. > &pV.) %then
+          %if NOT %sysevalf(&rV. &rVsign. &pV.) %then
            %do;
              %put ERROR: Additional content for package &packageName. will not be loaded!;
-              %put ERROR- Required version is &requiredVersion.;
-              %put ERROR- Provided version is &packageVersion.;
+              %put ERROR- Required version is &rV0.;
+              %put ERROR- Provided version is &pV0.;
+              %put ERROR- Condition %bquote((&rV0. &rVsign. &pV0.)) evaluates to %sysevalf(&rV. &rVsign. &pV.);
              %put ERROR- Verify installed version of the package.;
              %put ERROR- ;
              %GOTO WrongVersionOFPackageAddCnt; /*%RETURN;*/
@@ -179,7 +191,7 @@ minoperator

          /*options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp.;*/
          filename &_PackageFileref_. &ZIP. 
-            "&path./%lowcase(&packageName.).&zip."
+            "&path./%sysfunc(lowcase(&packageName.)).&zip."
            member='addcnt.zip'
          ;
          /*********************/
@@ -187,10 +199,10 @@ minoperator
          %if %sysfunc(fexist(&_TargetFileref_.)) %then
            %do;

-              %if %sysfunc(fileexist(%sysfunc(pathname(&_TargetFileref_.))/%lowcase(&packageName.)_AdditionalContent)) %then
+              %if %sysfunc(fileexist(%sysfunc(pathname(&_TargetFileref_.))/%sysfunc(lowcase(&packageName.))_AdditionalContent)) %then
                %do; /* dir for AC already exists */
                  %put WARNING: Target location:;
-                  %put WARNING- %sysfunc(pathname(&_TargetFileref_.))/%lowcase(&packageName.)_AdditionalContent;
+                  %put WARNING- %sysfunc(pathname(&_TargetFileref_.))/%sysfunc(lowcase(&packageName.))_AdditionalContent;
                  %put WARNING- already exist. Please remove it manually to upload additional contents.;
                  %put WARNING- Additional Content will not be loaded.;
                  %put WARNING- ;
@@ -201,12 +213,12 @@ minoperator
                  /* create target location */
                  %put INFO:;
                  %put Additional content will be located in:;
-                  %put %sysfunc(dcreate(%lowcase(&packageName.)_AdditionalContent,%sysfunc(pathname(&_TargetFileref_.))));
+                  %put %sysfunc(dcreate(%sysfunc(lowcase(&packageName.))_AdditionalContent,%sysfunc(pathname(&_TargetFileref_.))));

-                  %if NOT (%sysfunc(fileexist(%sysfunc(pathname(&_TargetFileref_.))/%lowcase(&packageName.)_AdditionalContent))) %then
+                  %if NOT (%sysfunc(fileexist(%sysfunc(pathname(&_TargetFileref_.))/%sysfunc(lowcase(&packageName.))_AdditionalContent))) %then
                    %do; /* dir for AC cannot be generated */
                      %put ERROR: Cannot create target location:;
-                      %put ERROR- %sysfunc(pathname(&_TargetFileref_.))/%lowcase(&packageName.)_AdditionalContent;
+                      %put ERROR- %sysfunc(pathname(&_TargetFileref_.))/%sysfunc(lowcase(&packageName.))_AdditionalContent;
                      %put ERROR- Additional Content will not be loaded.;
                      %put ERROR- ;
                    %end;
@@ -225,7 +237,7 @@ minoperator

                        if fexist("in") then
                          do;
-                            rc2=filename("out", pathname("WORK")!!"/%lowcase(&packageName.)addcnt.zip", "disk", "lrecl=1 recfm=n");
+                            rc2=filename("out", pathname("WORK")!!"/%sysfunc(lowcase(&packageName.))addcnt.zip", "disk", "lrecl=1 recfm=n");
                            length rc2txt $ 8192;
                            rc2txt=sysmsg();

@@ -254,9 +266,9 @@ minoperator
                      %if &AdditionalContent. %then 
                        %do;
                          filename f DUMMY;
-                          filename f ZIP "%sysfunc(pathname(WORK))/%lowcase(&packageName.)addcnt.zip";
+                          filename f ZIP "%sysfunc(pathname(WORK))/%sysfunc(lowcase(&packageName.))addcnt.zip";
                          options dlCreateDir;
-                          libname outData "%sysfunc(pathname(&_TargetFileref_.))/%lowcase(&packageName.)_AdditionalContent";
+                          libname outData "%sysfunc(pathname(&_TargetFileref_.))/%sysfunc(lowcase(&packageName.))_AdditionalContent";

                          data WORK.__&_TargetFileref_._zip___;
                            did = dopen("f");
@@ -364,12 +376,10 @@ minoperator
  options ls = &ls_tmp. ps = &ps_tmp. 
          &notes_tmp. &source_tmp. 
          &stimer_tmp. &fullstimer_tmp.
-          msglevel=&msglevel_tmp.;
+          msglevel=&msglevel_tmp. &mautocomploc_tmp.;

 %ENDofloadPackageAddCnt:
 %mend loadPackageAddCnt;

-
-
-
 /**/
+
--- a/SPF/Macros/loadpackages.sas
+++ b/SPF/Macros/loadpackages.sas
@@ -11,7 +11,7 @@
                 */
 )/secure 
 /*** HELP END ***/
-des = 'Macro to load multiple SAS packages at one run, version 20240711. Run %loadPackages() for help info.'
+des = 'Macro to load multiple SAS packages at one run, version 20250729. Run %loadPackages() for help info.'
 parmbuff
 ;
 %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then
@@ -27,7 +27,7 @@ parmbuff
    %put ###      This is short help information for the `loadPackageS` macro            #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro wrapper for the loadPackage macro, version `20240711`                   #;
+    %put # Macro wrapper for the loadPackage macro, version `20250729`                   #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -52,6 +52,7 @@ parmbuff
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put #### Example ####################################################################;
    %put #                                                                               #;
@@ -79,7 +80,7 @@ parmbuff
  %local lengthOfsyspbuff numberOfPackagesNames i packageElement packageName packageVersion str;

  %let lengthOfsyspbuff      = %qsysfunc(length(&syspbuff.));
-  %let packagesNames         = %qsysfunc(compress(%qsubstr(&syspbuff., 2, %eval(&lengthOfsyspbuff.-2)), {[(. _,)]}, KDA));
+  %let packagesNames         = %qsysfunc(compress(%qsubstr(&syspbuff., 2, %eval(&lengthOfsyspbuff.-2)), {[(. <=>_,)]}, KDA));
  
  %let str = %qsysfunc(translate(%superq(packagesNames),[[ ]],{(,)}));
  %let str = %qsysfunc(transtrn(%superq(str),],%str(] )));
--- a/SPF/Macros/previewpackage.sas
+++ b/SPF/Macros/previewpackage.sas
@@ -23,7 +23,7 @@
                                       */
 )/secure
 /*** HELP END ***/
-des = 'Macro to preview content of a SAS package, version 20240711. Run %previewPackage() for help info.'
+des = 'Macro to preview content of a SAS package, version 20250729. Run %previewPackage() for help info.'
 ;
 %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then
  %do;
@@ -38,7 +38,7 @@ des = 'Macro to preview content of a SAS package, version 20240711. Run %preview
    %put ###    This is short help information for the `previewPackage` macro            #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro to get preview of a SAS packages, version `20240711`                    #;
+    %put # Macro to get preview of a SAS packages, version `20250729`                    #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -82,6 +82,7 @@ des = 'Macro to preview content of a SAS package, version 20240711. Run %preview
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put #### Example ####################################################################;
    %put #                                                                               #;
@@ -106,17 +107,20 @@ des = 'Macro to preview content of a SAS package, version 20240711. Run %preview
    %GOTO ENDofpreviewPackage;
  %end;
  
-  %local ls_tmp ps_tmp notes_tmp source_tmp msglevel_tmp;
+  %local ls_tmp ps_tmp notes_tmp source_tmp msglevel_tmp mautocomploc_tmp;
  %let ls_tmp       = %sysfunc(getoption(ls));
  %let ps_tmp       = %sysfunc(getoption(ps));
  %let notes_tmp    = %sysfunc(getoption(notes));
  %let source_tmp   = %sysfunc(getoption(source));
  %let msglevel_tmp = %sysfunc(getoption(msglevel));
-  options NOnotes NOsource ls=MAX ps=MAX msglevel=N;
+  %let mautocomploc_tmp = %sysfunc(getoption(mautocomploc));
+
+  options NOnotes NOsource ls=MAX ps=MAX msglevel=N NOmautocomploc;
  
  %local _PackageFileref_;
-  /* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */
-  data _null_; call symputX("_PackageFileref_", "P" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); run;
+  data _null_; 
+    call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
+  run;

  /* when the packages reference is multi-directory search for the first one containing the package */
  data _null_;
@@ -126,7 +130,7 @@ des = 'Macro to preview content of a SAS package, version 20240711. Run %preview
    if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */
    do i = 1 to kcountw(packages, "()", "QS");
      p = dequote(kscanx(packages, i, "()", "QS"));
-      exists + fileexist(catx("/", p, "%lowcase(&packageName.).&zip."));
+      exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip."));
      if exists then leave;
    end;
    if exists then call symputx("path", p, "L");
@@ -134,7 +138,7 @@ des = 'Macro to preview content of a SAS package, version 20240711. Run %preview

  filename &_PackageFileref_. &ZIP. 
  /* put location of package myPackageFile.zip here */
-    "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+    "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
  ;
  %if %sysfunc(fexist(&_PackageFileref_.)) %then
    %do;
@@ -142,7 +146,7 @@ des = 'Macro to preview content of a SAS package, version 20240711. Run %preview
      filename &_PackageFileref_. clear;
      options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp.;
      filename &_PackageFileref_. &ZIP. 
-        "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+        "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
        ENCODING =
          %if %bquote(&packageEncoding.) NE %then &packageEncoding. ;
                                            %else utf8 ;
@@ -152,7 +156,8 @@ des = 'Macro to preview content of a SAS package, version 20240711. Run %preview
  %else %put ERROR:[&sysmacroname] File "&path./&packageName..&zip." does not exist!;
  filename &_PackageFileref_. clear;
  
-  options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp. msglevel = &msglevel_tmp.;
+  options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp. 
+          msglevel = &msglevel_tmp. &mautocomploc_tmp.;
  
 %ENDofpreviewPackage:
 %mend previewPackage;
--- a/SPF/Macros/splitcodeforpackage.sas
+++ b/SPF/Macros/splitcodeforpackage.sas
@@ -0,0 +1,423 @@
+/*+splitCodeForPackage+*/
+/*** HELP START ***/
+
+%macro splitCodeForPackage(
+ codeFile          /* a code file to split */
+,packagePath=      /* location for results */
+,debug=0           /* technical parameter  */
+,nobs=0            /* technical parameter  */
+)
+/*** HELP START ***/
+/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20250729. Run %splitCodeForPackage() for help info.'
+;
+/*%macro _();%mend _;*/
+%if (%superq(codeFile) = ) OR (%qupcase(&codeFile.) = HELP) %then
+  %do;
+    %local options_tmp ;
+    %let options_tmp = ls=%sysfunc(getoption(ls))ps=%sysfunc(getoption(ps))
+     %sysfunc(getoption(notes)) %sysfunc(getoption(source))
+     msglevel=%sysfunc(getoption(msglevel))
+    ;
+    options NOnotes NOsource ls=MAX ps=MAX msglevel=N;
+    %put ;
+    %put #################################################################################;
+    %put ###     This is short help information for the `splitCodeForPackage` macro      #;
+    %put #-------------------------------------------------------------------------------#;
+    %put #                                                                               #;
+    %put # Utility macro to *split* single file with SAS package code into multiple      #;
+    %put # files with separate snippets, version `20250729`                              #;
+    %put #                                                                               #;
+    %put # A SAS package is a zip file containing a group                                #;
+    %put # of SAS codes (macros, functions, data steps generating                        #;
+    %put # data, etc.) wrapped up together and included by                               #;
+    %put # a single `load.sas` file (also embedded inside the zip).                      #;
+    %put #                                                                               #;
+    %put # The `%nrstr(%%splitCodeForPackage())` macro takes a file with SAS code                 #;
+    %put # snippets surrounded by `%str(/)*##$##-code-block-start-##$## <tag spec> *%str(/)` and     #;
+    %put # `%str(/)*##$##-code-block-end-##$## <tag spec> *%str(/)` tags and split that file into    #;
+    %put # multiple files and directories according to a tag specification.              #;
+    %put #                                                                               #;
+    %put # The `<tag spec>` is a list of pairs of the form: `type(object)` that          #;
+    %put # indicates how the file should be split. See example 1 below for details.      #;
+    %put #                                                                               #;
+    %put #-------------------------------------------------------------------------------#;
+    %put #### Parameters:                                                                #;
+    %put #                                                                               #;
+    %put # 1. `codeFile=`        *Required.* Name of a file containing code              #;
+    %put #                        that will be split. Required and not null.             #;
+    %put #                        If empty displays this help information.               #;
+    %put #                                                                               #;
+    %put # - `packagePath=`      *Required.* Location for package files after            #;
+    %put #                        splitting into separate files and directories.         #;
+    %put #                        If missing or not exist then `WORK` is uded.           #;
+    %put #                                                                               #;
+    %put # - `debug=`            *Optional.* Turns on code printing for debugging.       #;
+    %put #                                                                               #;
+    %put # - `nobs=`             *Optional.* Technical parameter with value `0`.         #;
+    %put #                        Do not change.                                         #;
+    %put #                                                                               #;
+    %put #-------------------------------------------------------------------------------#;
+    %put #                                                                               #;
+    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
+    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
+    %put #                                                                               #;
+    %put ### Example 1 ###################################################################;
+    %put #                                                                               #;
+    %put #   Assume that the `myPackageCode.sas` file                                    #;
+    %put #   is located in the `C:/lazy/` folder and                                     #;
+    %put #   contain the following code and tags:                                        #;
+    %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas;
+    %put  ;
+    %put  %nrstr( /)%nrstr(*##$##-code-block-start-##$## 01_macro(abc) */                );
+    %put  %nrstr( %%macro abc();                                                         );
+    %put  %nrstr(   %%put I am "abc".;                                                   );
+    %put  %nrstr( %%mend abc;                                                            );
+    %put  %nrstr( /)%nrstr(*##$##-code-block-end-##$## 01_macro(abc) */                  );
+    %put  ;
+    %put  %nrstr( /)%nrstr(*##$##-code-block-start-##$## 01_macro(efg) */                );
+    %put  %nrstr( %%macro efg();                                                         );
+    %put  %nrstr(   %%put I am "efg".;                                                   );
+    %put  %nrstr( %%mend efg;                                                            );
+    %put  %nrstr( /)%nrstr(*##$##-code-block-end-##$## 01_macro(efg) */                  );
+    %put  ;
+    %put  %nrstr( proc FCMP outlib=work.f.p;                                             );
+    %put  %nrstr( /)%nrstr(*##$##-code-block-start-##$## 02_functions(xyz) */            );
+    %put  %nrstr( function xyz(n);                                                       );
+    %put  %nrstr(   return(n**2 + n + 1)                                                 );
+    %put  %nrstr( endfunc;                                                               );
+    %put  %nrstr( /)%nrstr(*##$##-code-block-end-##$## 02_functions(xyz) */              );
+    %put  %nrstr( quit;                                                                  );
+    %put  ;
+    %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~;
+    %put #                                                                               #;
+    %put # and we want results in `C:/split/` folder, we run the following:              #;
+    %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas;
+    %put  %nrstr( filename packages "C:/SAS_PACKAGES"; %%* setup a directory for packages;);
+    %put  %nrstr( %%include packages(SPFinit.sas);      %%* enable the framework;         );
+    %put  ;
+    %put  %nrstr( %%splitCodeForPackage%(                                                 );
+    %put  %nrstr(    codeFile=C:/lazy/myPackageCode.sas                                   );
+    %put  %nrstr(   ,packagePath=C:/split/ %)                                             );
+    %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~;
+    %put #                                                                               #;
+    %put #################################################################################;
+    %put ;
+    options &options_tmp.;                        
+    %GOTO ENDofsplitCodeForPackage;
+  %end;
+
+
+%local options_tmp2 ;
+%let options_tmp2 = ls=%sysfunc(getoption(ls)) ps=%sysfunc(getoption(ps))
+%sysfunc(getoption(notes)) %sysfunc(getoption(source))
+msglevel=%sysfunc(getoption(msglevel))
+;
+options nomprint nosymbolgen nomlogic notes source ls=MAX ps=MAX msglevel=N ;
+
+%let debug = %sysevalf(NOT(0=%superq(debug)));
+%if 1=&debug. %then
+  %do;
+    options mprint symbolgen mlogic source source2 msglevel=i;
+  %end;
+
+%put NOTE- --&SYSMACRONAME.-START--;
+%local rc;
+%let rc = %sysfunc(doSubL(%nrstr(
+  options
+  %sysfunc(ifc(1=&debug.
+  ,msglevel=I ls=max ps=64 notes mprint symbolgen mlogic source source2
+  ,msglevel=N ls=max ps=64 nonotes nomprint nosymbolgen nomlogic nosource nosource2
+  ))
+  ;;;;
+
+  options DLcreateDir;
+  libname w "%sysfunc(pathname(WORK))/_splitCodeForPackage_";
+  filename d "%sysfunc(pathname(WORK))/_splitCodeForPackage_/dummy";
+  data _null_;
+    file d;
+    put "dummy";
+  run;
+
+  data _null_;
+    length codeFile $ 4096;
+    codeFile = symget('codeFile');
+    codeFile = dequote(codeFile);
+   
+    if fileexist(codeFile) then 
+      do;
+        codeFile = quote(strip(codeFile),"'");
+        call symputX("codeFile",codeFile,"L");
+      end;
+    else 
+      do;      
+        put "ERROR: [splitCodeForPackage] File " codeFile 'does not exist!';
+        call symputX("codeFile",quote(strip(pathname('d'))),"L");
+      end;
+  run;
+
+  options notes;
+  filename source &codeFile.;
+  filename source LIST;
+  options nonotes;
+
+  data _null_;
+    length packagePath work $ 4096;
+    work = pathname('WORK');
+    packagePath = coalescec(symget('packagePath'), work);
+    rc = fileexist(packagePath);
+    if NOT rc then packagePath = work;
+    if rc = 1 then put "INFO: " @;
+              else put "WARNING: " @;
+    put packagePath=; 
+    call symputX('packagePath',packagePath,"L");
+  run;
+
+
+  data w.files;
+    stop;
+  run;
+
+  data _null_;
+    if 1 = _N_ then
+      do;
+        declare hash H(ordered:"A");
+        H.defineKey('token');
+        H.defineData('token','start','end','lineNumber');
+        H.defineDone();
+      end;
+    if 1 = _E_ then
+      do;
+        H.output(dataset:'w.files');  
+      end;
+
+    infile source END=_E_;
+    lineNumberN+1;
+    input;
+
+    length line $ 4096 lineNumber $ 256;
+    line = left(lowcase(_infile_));
+    block=scan(line,1," ");
+
+    if block in (
+      '/*##$##-code-block-start-##$##' 
+      '/*##$##-code-block-end-##$##'
+    ); 
+
+    if substr(block,20,1) = 's' then 
+      do; s=1; e=0; end;
+    else
+      do; s=0; e=1; end;
+
+    i=1;
+    token=block;
+    do while(i);
+      i+1;
+      token=scan(line,i," ");
+      if token='*/' OR token=' ' then i=0;
+      else
+        do;
+          start=0; end=0;
+          if H.find() then
+            do;
+              start=s;
+              end  =e;
+              lineNumber = cats(lineNumberN);
+            end;
+          else
+            do;
+              start+s;
+              end  +e; 
+              lineNumber = catx(",",lineNumber,lineNumberN);
+            end;
+          H.replace();
+          /*putlog token= s= e= start= end=;*/
+        end;
+    end;
+  run;
+
+  title;
+  title1 "Attention!!! Not Matching Tags!";
+  title2 "Verify following tags in file:";
+  title3 &codeFile.;
+  proc print data=w.files(where=(start NE end));
+  run;
+  title;
+
+  data w.files;
+    set w.files end=_E_ nobs=nobs; 
+    where start=end;
+    length dir $ 128 code $ 32 path $ 160;
+    dir =coalescec(scan(token,1,'()'),'!BAD_DIRECTORY');
+    code=coalescec(scan(token,2,'()'),'!BAD_CODE_FILE');
+    if dir = '!BAD_DIRECTORY' or code = '!BAD_CODE_FILE' then
+      put "WARNING: Bad directory or code file name!" 
+        / "WARNING- Check tag: " token ;
+    path=cats('/',dir,'/',code,'.sas'); /* .sas */
+  run;
+
+  title;
+  title1 "List of tags with value _ALL_ for 'dir' or 'code' variable.";
+  title2 "Snippets tagged this way will be copied to multiple files.";
+  proc print data=w.files(where=(dir = '_all_' OR code = '_all_'));
+  run;
+  title;
+
+  data w.files;
+    if 0=nobs then
+      put "WARNING: No tags found in the file";
+    
+    set w.files end=_E_ nobs=nobs; 
+    where dir NE '_all_' AND code NE '_all_';
+    n+1;
+    if 1 = _E_ then 
+      call symputX('nobs',n,"L");
+  run;
+
+  title;
+  title "List of files";
+  proc print data=w.files;
+  run;
+  title;
+
+  data _null_;
+    set w.files;
+    rc = libname("_",catx("/",symget('packagePath'),dir));
+    rc = libname("_");
+  run;
+
+  filename f DUMMY;
+  data _null_;
+    if 1 =_N_ then
+      do;
+        array paths[0:&nobs.] $ 128 _temporary_;
+        array starts[0:&nobs.] _temporary_;
+        array ends[0:&nobs.] _temporary_;
+        array write[0:&nobs.] _temporary_;
+        array firstLine[0:&nobs.] _temporary_;
+
+        declare hash H();
+        H.defineKey('token');
+        H.defineData('n');
+        H.defineDone();
+
+        do until(_E_);
+          set w.files end=_E_;
+          paths[n]=path;
+          starts[n]=start;
+          ends[n]=end;
+          write[n]=0;
+          rc=H.add();
+          firstLine[n]=1;
+        end;
+        _E_=.;
+        length packagePath $ 4096;
+        retain packagePath " ";
+        packagePath=symget('packagePath');
+      end;
+
+    infile source END=_E_;
+    input;
+
+    length line /*lineToPrint*/ $ 4096;
+    line = left(lowcase(_infile_));
+    /*lineToPrint=_infile_;*/
+    block=scan(line,1," ");
+
+    if block in (
+      '/*##$##-code-block-start-##$##' 
+      '/*##$##-code-block-end-##$##'
+    ) then 
+      do;
+        /********************************************************/
+        if substr(block,20,1) = 's' then 
+          do; s=1; e=0; end;
+        else
+          do; s=0; e=1; end;
+
+        i=1;
+        token=block;
+        do while(i);
+          i+1;
+          token=scan(line,i," ");
+          if token='*/' OR token=' ' then i=0; /* if it is the end of list - stop */
+          else if token='_all_(_all_)' then /* if this is a snippet for ALL files in a package */
+            do k=1 to &nobs.;
+              starts[k]+ -s;
+              ends[k]  + -e;
+              write[k] + (s-e);
+            end;
+          else if scan(token,2,'()')='_all_' then /* if this is a snippet for ALL files in a type */
+            do k=1 to &nobs.;
+              if scan(token,1,'()')=scan(paths[k],1,'/\') then 
+                do;
+                  starts[k]+ -s;
+                  ends[k]  + -e;
+                  write[k] + (s-e);
+                end;
+            end;
+          else if scan(token,1,'()')='_all_' then /* if this is a snippet for ALL files with the same name */
+            do k=1 to &nobs.;
+              if (scan(token,2,'()')!!'.sas')=scan(paths[k],2,'/\') then 
+                do;
+                  starts[k]+ -s;
+                  ends[k]  + -e;
+                  write[k] + (s-e);
+                end;
+            end;
+          else /* all other "regular" cases */
+            do;
+              if 0=H.find() then
+                do;
+                  starts[n]+ -s;
+                  ends[n]  + -e;
+                  write[n] + (s-e);
+                  select;
+                    when(write[n]<0)
+                      putlog "ERROR: Wrong tags order for " token=;
+                    when(write[n]>1) 
+                      do;
+                        putlog "WARNING: Doubled value for tag" token=;
+                        putlog "WARNING- detected in line " _N_;
+                        putlog "WARNING- Check also counterpart block.";
+                      end;
+                    otherwise;
+                  end;
+                end;
+            end;
+        end;
+        /********************************************************/
+      end;
+    else
+      do j = 1 to hbound(write);
+        if write[j]>0 then
+          do;
+            length fvariable $ 4096;
+            fvariable=catx("/",packagePath,paths[j]);
+            file f FILEVAR=fvariable MOD;
+            /*
+            lineToPrintLen=(lengthn(lineToPrint));
+            if lineToPrintLen then
+              put @1 lineToPrint $varying4096. lineToPrintLen;
+            else put;
+            */
+            if firstLine[j] then
+              do;
+                put '/* File generated with help of SAS Packages Framework, version 20250729. */';
+                firstLine[j]=0;
+              end; 
+            put _infile_;
+          end;    
+      end;
+  run;
+
+  filename f clear;
+  libname w clear;
+)));
+%put NOTE- --&sysmacroname.-END--;
+options &options_tmp2.;
+%ENDofsplitCodeForPackage:
+%mend splitCodeForPackage;
+
+
+/**/
--- a/SPF/Macros/unloadpackage.sas
+++ b/SPF/Macros/unloadpackage.sas
@@ -20,7 +20,7 @@
                                       */
 )/secure
 /*** HELP END ***/
-des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for help info.'
+des = 'Macro to unload SAS package, version 20250729. Run %unloadPackage() for help info.'
 ;
 %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then
  %do;
@@ -35,7 +35,7 @@ des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for h
    %put ###      This is short help information for the `unloadPackage` macro           #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro to unload SAS packages, version `20240711`                              #;
+    %put # Macro to unload SAS packages, version `20250729`                              #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -75,6 +75,7 @@ des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for h
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put ### Example #####################################################################;
    %put #                                                                               #;
@@ -102,18 +103,20 @@ des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for h
  %end;

  /* local variables for options */
-  %local ls_tmp ps_tmp notes_tmp source_tmp msglevel_tmp;
+  %local ls_tmp ps_tmp notes_tmp source_tmp msglevel_tmp mautocomploc_tmp;
  %let ls_tmp       = %sysfunc(getoption(ls));
  %let ps_tmp       = %sysfunc(getoption(ps));
  %let notes_tmp    = %sysfunc(getoption(notes));
  %let source_tmp   = %sysfunc(getoption(source));
  %let msglevel_tmp = %sysfunc(getoption(msglevel));
+  %let mautocomploc_tmp = %sysfunc(getoption(mautocomploc));

-  options NOnotes NOsource ls=MAX ps=MAX msglevel=N;
+  options NOnotes NOsource ls=MAX ps=MAX msglevel=N NOmautocomploc;

  %local _PackageFileref_;
-  /* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */
-  data _null_; call symputX("_PackageFileref_", "P" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); run;
+  data _null_; 
+    call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
+  run;

  /* when the packages reference is multi-directory search for the first one containing the package */
  data _null_;
@@ -123,7 +126,7 @@ des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for h
    if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */
    do i = 1 to kcountw(packages, "()", "QS");
      p = dequote(kscanx(packages, i, "()", "QS"));
-      exists + fileexist(catx("/", p, "%lowcase(&packageName.).&zip."));
+      exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip."));
      if exists then leave;
    end;
    if exists then call symputx("path", p, "L");
@@ -131,7 +134,7 @@ des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for h
 
  filename &_PackageFileref_. &ZIP. 
  /* put location of package myPackageFile.zip here */
-    "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+    "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
  ;
  %if %sysfunc(fexist(&_PackageFileref_.)) %then
    %do;
@@ -139,7 +142,7 @@ des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for h
      filename &_PackageFileref_. clear;
      options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp.;
      filename &_PackageFileref_. &ZIP. 
-        "&path./%lowcase(&packageName.).&zip." %unquote(&options.)
+        "&path./%sysfunc(lowcase(&packageName.)).&zip." %unquote(&options.)
        ENCODING =
          %if %bquote(&packageEncoding.) NE %then &packageEncoding. ;
                                            %else utf8 ;
@@ -149,7 +152,8 @@ des = 'Macro to unload SAS package, version 20240711. Run %unloadPackage() for h
  %else %put ERROR:[&sysmacroname] File "&path./&packageName..&zip." does not exist!;
  filename &_PackageFileref_. clear;

-  options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp. msglevel = &msglevel_tmp.;
+  options ls = &ls_tmp. ps = &ps_tmp. &notes_tmp. &source_tmp. 
+          msglevel = &msglevel_tmp. &mautocomploc_tmp.;

 %ENDofunloadPackage:
 %mend unloadPackage;
--- a/SPF/Macros/verifypackage.sas
+++ b/SPF/Macros/verifypackage.sas
@@ -13,7 +13,7 @@
                                         hashing_file() function, SAS 9.4M6 */
 )/secure 
 /*** HELP END ***/
-des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %verifyPackage() for help info.'
+des = 'Macro to verify SAS package with the hash digest, version 20250729. Run %verifyPackage() for help info.'
 ;
 %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then
  %do;
@@ -28,7 +28,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %
    %put ###      This is short help information for the `verifyPackage` macro           #;
    %put #-------------------------------------------------------------------------------#;
    %put #                                                                               #;
-    %put # Macro to verify SAS package with it hash digest, version `20240711`           #;
+    %put # Macro to verify SAS package with it hash digest, version `20250729`           #;
    %put #                                                                               #;
    %put # A SAS package is a zip file containing a group                                #;
    %put # of SAS codes (macros, functions, data steps generating                        #;
@@ -58,6 +58,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %
    %put #                                                                               #;
    %put # Visit: `https://github.com/yabwon/SAS_PACKAGES/tree/main/SPF/Documentation`   #;
    %put # to learn more.                                                                #;
+    %put # Tutorials available at: `https://github.com/yabwon/HoW-SASPackages`           #;
    %put #                                                                               #;
    %put #### Example ####################################################################;
    %put #                                                                               #;
@@ -83,7 +84,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %
    %GOTO ENDofverifyPackage;
  %end;
  
-  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp;
+  %local ls_tmp ps_tmp notes_tmp source_tmp stimer_tmp fullstimer_tmp msglevel_tmp mautocomploc_tmp;
  %let ls_tmp         = %sysfunc(getoption(ls));
  %let ps_tmp         = %sysfunc(getoption(ps));
  %let notes_tmp      = %sysfunc(getoption(notes));
@@ -91,12 +92,14 @@ des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %
  %let stimer_tmp     = %sysfunc(getoption(stimer));
  %let fullstimer_tmp = %sysfunc(getoption(fullstimer));
  %let msglevel_tmp   = %sysfunc(getoption(msglevel));
+  %let mautocomploc_tmp = %sysfunc(getoption(mautocomploc));
  
-  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N;
+  options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc;
  
  %local _PackageFileref_;
-  /* %let _PackageFileref_ = P%sysfunc(MD5(%lowcase(&packageName.)),hex7.); */
-  data _null_; call symputX("_PackageFileref_", "P" !! put(MD5("%lowcase(&packageName.)"), hex7. -L), "L"); run;
+  data _null_; 
+    call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); 
+  run;

  /* when the packages reference is multi-directory search for the first one containing the package */
  data _null_;
@@ -106,7 +109,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %
    if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */
    do i = 1 to kcountw(packages, "()", "QS");
      p = dequote(kscanx(packages, i, "()", "QS"));
-      exists + fileexist(catx("/", p, "%lowcase(&packageName.).zip"));
+      exists + fileexist(catx("/", p, lowcase("&packageName.") !! "zip")); /* check on zip files only! */
      if exists then leave;
    end;
    if exists then call symputx("path", p, "L");
@@ -114,7 +117,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %

  filename &_PackageFileref_. 
  /* put location of package myPackageFile.zip here */
-    "&path./%lowcase(&packageName.).zip"
+    "&path./%sysfunc(lowcase(&packageName.)).zip"
  ;
  %if %sysfunc(fexist(&_PackageFileref_.)) %then
    %do;
@@ -176,7 +179,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20240711. Run %
  options ls = &ls_tmp. ps = &ps_tmp. 
          &notes_tmp. &source_tmp. 
          &stimer_tmp. &fullstimer_tmp.
-          msglevel=&msglevel_tmp.;
+          msglevel=&msglevel_tmp. &mautocomploc_tmp.;
          
 %ENDofverifyPackage:
 %mend verifyPackage;
--- a/SPF/SPFinit.md
+++ b/SPF/SPFinit.md
--- a/SPF/SPFinit.sas
+++ b/SPF/SPFinit.sas
--- a/SPF/license.sas
+++ b/SPF/license.sas
@@ -1,4 +1,4 @@
-Copyright (c) 2019 - 2023 Bartosz Jablonski 
+Copyright (c) 2019 - 2025 Bartosz Jablonski 

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/packages/README.md
+++ b/packages/README.md
@@ -24,7 +24,7 @@ run;
 ```
 SHA256 digest for SQLinDS: F*3C010734B76CA7459C4D35087C899121011CD4AA2932B56335FF11A805C8EF8D

-[Documentation for SQLinDS](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/sqlinds.md "Documentation for SQLinDS")
+[Documentation for SQLinDS](https://github.com/SASPAC/blob/main/sqlinds.md "Documentation for SQLinDS")

 ---

@@ -57,7 +57,7 @@ run;
 ```
 SHA256 digest for DFA: F*012375D87F66EB3A7BF5DDD0CC5AEE28851733EE33CC63231DF9045BEB958168

-[Documentation for DFA](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/dfa.md "Documentation for DFA")
+[Documentation for DFA](https://github.com/SASPAC/blob/main/dfa.md "Documentation for DFA")

 ---

@@ -82,11 +82,11 @@ SHA256 digest for DFA: F*012375D87F66EB3A7BF5DDD0CC5AEE28851733EE33CC63231DF9045
 ```
 SHA256 digest for macroArray: F*3F3893F1FCD78719543703E4353F4CC19811D247C016F220FF729B283C1AD790

-[Documentation for macroArray](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/macroarray.md "Documentation for macroArray")
+[Documentation for macroArray](https://github.com/SASPAC/blob/main/macroarray.md "Documentation for macroArray")

 ---

- **BasePlus**\[2.0.0\] adds a bunch of functionalities I am missing in BASE SAS, such as: 
+- **BasePlus**\[2.4.1\] adds a bunch of functionalities I am missing in BASE SAS, such as: 
 ```sas
 call arrMissToRight(myArray); 
 call arrFillMiss(17, myArray); 
@@ -118,9 +118,9 @@ format x bool.;

 %put #%expandDataSetsList(lib=sashelp,datasets=_all_)#;
 ```
-SHA256 digest for BasePlus: F*0730DD793516E5C193842126A7EC9D339ADADD19F0F40B071F938CABDE4E66AD
+SHA256 digest for BasePlus: F*DB0811D8F207641BD45FCE30CB75D03CDF8D06849EBEA268BB575358FAA4E76C

-[Documentation for BasePlus](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/baseplus.md "Documentation for BasePlus")
+[Documentation for BasePlus](https://github.com/SASPAC/blob/main/baseplus.md "Documentation for BasePlus")

 ---

@@ -135,7 +135,7 @@ SHA256 digest for BasePlus: F*0730DD793516E5C193842126A7EC9D339ADADD19F0F40B071F

 SHA256 digest for GSM: F*80197391195C3EC41BD436DF0C8802D3920E4D22B64009A7DE872FBDF8D4B86E

-[Documentation for GSM](https://github.com/yabwon/SAS_PACKAGES/blob/main/packages/gsm.md "Documentation for GSM")
+[Documentation for GSM](https://github.com/SASPAC/blob/main/gsm.md "Documentation for GSM")

 ---

--- a/packages/SHA256_for_packages.txt
+++ b/packages/SHA256_for_packages.txt
@@ -1,4 +1,22 @@
-/* 20240722 */
+/* 20250905 */
+BasePlus: F*DB0811D8F207641BD45FCE30CB75D03CDF8D06849EBEA268BB575358FAA4E76C
+
+/* 20250807 */
+BasePlus: F*19FE220C82DE4B9990B4AC352A9D9DEF5FAF2FD601BE756B2F3A2AC39CDAF381
+
+/* 20250805 */
+BasePlus: F*B2D318DD9708D74E5A7C419F7CAE1BF46D662B7F6AEE7E6B1B9D9B6858A5C41A
+
+/* 20250804 */
+BasePlus: F*71DC1AFA709B2977E8AEA452721776F62EEC8240ABD658AC83AA6D4310FC49B6
+
+/* 20240909 */
+BasePlus: F*DFA83F8E0D7424DEB63D49620392068BC68D766552E2804CB6B01DE8E5A87769
+
+/* 20240724 */
+BasePlus: F*FB102C9B12E870666C15A651017D48E0141E47D64C11437350D0EC75A7E9E609
+
+/* 20240723 */
 BasePlus: F*0730DD793516E5C193842126A7EC9D339ADADD19F0F40B071F938CABDE4E66AD

 /* 20240722 */
--- a/packages/baseplus.md
+++ b/packages/baseplus.md
@@ -9,22 +9,22 @@
 ### Version information:
  
 - Package: BasePlus
- Version: 2.0.0
- Generated: 2024-07-23T21:51:33
+- Version: 2.4.1
+- Generated: 2025-09-05T10:12:32
 - Author(s): Bartosz Jablonski (yabwon@gmail.com), Quentin McMullen (qmcmullen@gmail.com)
 - Maintainer(s): Bartosz Jablonski (yabwon@gmail.com)
 - License: MIT
- File SHA256: `F*0730DD793516E5C193842126A7EC9D339ADADD19F0F40B071F938CABDE4E66AD` for this version
- Content SHA256: `C*0352F7BB04B99D620BEFD33FF1B1FF1835E6F8F21CC6A764D05EEE51E77E57E0` for this version
+- File SHA256: `F*DB0811D8F207641BD45FCE30CB75D03CDF8D06849EBEA268BB575358FAA4E76C` for this version
+- Content SHA256: `C*27861ABABB412E8229FE25CD5EEA868F49BB3CBD805CCE65F321ADBC522FAC4E` for this version
  
 ---
 
-# The `BasePlus` package, version: `2.0.0`;
+# The `BasePlus` package, version: `2.4.1`;
  
 ---
 

-# The BasePlus package [ver. 2.0.0] <a name="baseplus-package"></a> ###############################################
+# The BasePlus package [ver. 2.4.1] <a name="baseplus-package"></a> ###############################################

 The **BasePlus** package implements useful
 functions and functionalities I miss in the BASE SAS.
@@ -403,7 +403,7 @@ localization (only if additional content was deployed during the installation pr
 
 --------------------------------------------------------------------
 
-*SAS package generated by SAS Package Framework, version `20240711`*
+*SAS package generated by SAS Package Framework, version `20250729`*
 
 --------------------------------------------------------------------
 
@@ -838,6 +838,7 @@ The basic syntax is the following, the `<...>` means optional parameters:
  <,longFormat=>
  <,fileExt=>
  <,maxDepth=>
+  <,backslashSens=>
 )
 ~~~~~~~~~~~~~~~~~~~~~~~

@@ -868,6 +869,11 @@ The basic syntax is the following, the `<...>` means optional parameters:
 * `maxDepth=0`                - *Optional*, if not zero then indicates
                                maximum depth of search in the root path.

+* `backslashSens=0`           - *Optional*, if not zero then it indicates 
+                                that backslash(`\`) symbol in files and dirs 
+                                names is detectable under Linux. Accepted 
+                                values: `0` and `1`. Ignored under Windows. 
+

 ### EXAMPLES AND USECASES: ####################################################

@@ -989,7 +995,12 @@ The QgetVars() returns quoted value [by %superq()].

 See examples below for the details.

-The `%getVars()` macro executes like a pure macro code.
+When `mcArray=` is not used the `%getVars()` macro executes like 
+a pure macro code. When `mcArray=` is not null (creation of a
+macro variable array is requested) them a single semicolon is returned.
+
+When `validvarname=ANY` in set special care should be kept.
+See dedicated examples below.

 ### SYNTAX: ###################################################################

@@ -1003,6 +1014,7 @@ The basic syntax is the following, the `<...>` means optional parameters:
 <,quote=>
 <,mcArray=> 
 <,ignoreCases>
+ <,nlit=>
 )
 ~~~~~~~~~~~~~~~~~~~~~~~

@@ -1025,23 +1037,32 @@ The basic syntax is the following, the `<...>` means optional parameters:

 * `mcArray=`         - *Optional*, default value is blank.
                       1) When *null* - the macro behaves like a macro function 
-                          and returns a text string with variables list.
-                       2) When *not null* - behaviour of the macro is altered.
+                          and ban be used in the `%put` or `%let=` statements.
+                          The returned text is a string with variables list.
+                       2) When *not null* - behavior of the macro is altered.
                          In such case a macro array of selected variables, named 
                          with `mcArray` value as a prefix, is created.
                          Furthermore a macro named as `mcArray` value is generated.
                          (see the macroArray package for the details).
                          When `mcArray=` parameter is active the `getVars` macro 
-                          cannot be called within the `%put` statement. Execution like: 
-                           `%put %getVars(..., mcArray=XXX);` will result with  
-                          an Explicit & Radical Refuse Of Run (aka ERROR).
+                          should not be called within the `%put` or `%let=` statements. 
+                          A single semicolon is produced as the macro result, hence
+                          execution like: `%put %getVars(..., mcArray=XXX) some text;` 
+                          will result with an Explicit & Radical Refuse Of Run (aka ERROR).

-* `ignoreCases=`     - *Optional*, default value is 1.  
+* `ignoreCases=`     - *Optional*, default value is 1.
                        Indicates if search should be case insensitive.

+* `nlit=`            - *Optional*, default value is 0.
+                        Introduced to improve `validvarname=ANY` handling.
+                        Indicates if the `NLITERAL()` function should be 
+                        executed to cover spacial characters.
+
 
 ### EXAMPLES AND USECASES: ####################################################

+**When `validvarname=` option is _not_ `ANY`.** 
+
 **EXAMPLE 1.** A list of all variables from the 
               sashelp.class dataset:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas
@@ -1267,6 +1288,44 @@ run;
  %put %do_over(XYZ);
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+**When the `validvarname=ANY` option is set.** 
+
+**EXAMPLE 12.** Get all variables and handle special characters.
+                Without `nlit=1` the code will fail.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas
+  options validvarname = any;
+  data varnameANY;
+    set sashelp.class(obs=3);
+
+    'A&B'n=42;
+    'space name'n=101;
+    '2025-08'n=234;
+    '2025%09'n=235;
+    "2025'10"n=236;
+    '2025"11'n=237;
+  run; 
+
+  %put %getVars(varnameANY, nlit=1);
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**EXAMPLE 13.** Create macro variable array ABC for all variables.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas
+  %getVars(varnameANY, mcArray=ABC, nlit=1);
+  %put %ABC(1) %ABC(6) %ABC(7) %ABC(11);
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**EXAMPLE 14.** Get only variables with illegal characters in names.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas
+  %let notV7compliant = %getVars(varnameANY, pattern=[^a-z0-9_], nlit=1);
+  %put &notV7compliant.;
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+**EXAMPLE 14.** Print variables starting with a digit.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas
+  %put %getVars(varnameANY, pattern=^\d, nlit=1);
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 ---

  
@@ -1929,6 +1988,11 @@ The basic syntax is the following, the `<...>` means optional parameters:
 * `ignoreCases=`     - *Optional*, default value is 1.  
                        Indicates if search should be case insensitive.

+* `nlit=`            - *Optional*, default value is 0.
+                        Introduced to improve `validvarname=ANY` handling.
+                        Indicates if the `NLITERAL()` function should be 
+                        executed to cover spacial characters.
+
 
 ### EXAMPLES AND USECASES: ####################################################

@@ -2035,6 +2099,9 @@ plots of kernel density estimates, jitter data values, and box-and-whiskers plot

 See examples below for the details.

+The "Here Comes the Rain (Cloud Plot) Again" (B. Jablonski, 2024) article
+describing the macro is attached as an additional content to the package.
+
 ### SYNTAX: ###################################################################

 The basic syntax is the following, the `<...>` means optional parameters:
@@ -2052,6 +2119,7 @@ The basic syntax is the following, the `<...>` means optional parameters:
 <,boxPlotSymbolSize=>
 <,boxPlotLineSize=>
 <,boxPlotFill=>
+ <,whiskerScale=>
 <,meanShiftLine=>
 <,meanShiftStep=>
 <,meanShiftColors=>
@@ -2147,6 +2215,12 @@ The basic syntax is the following, the `<...>` means optional parameters:
                         Transparency of the box plot.
                         Ranges from 0.0 (opaque) to 1.0 (full translucent).

+* `whiskerScale=`      - *Optional*, default value `1.5`.                         
+                         It provides `WS` parameter in the `Q1 - WS*IQR`
+                         formula and the `Q3 + WS*IQR` formula.
+                         Provided value should be a positive number. 
+                         Otherwise it is set to 0.
+
 * `meanShiftLine`      - *Optional*, default value `0`.
                         Indicates if a line connecting mean symbol 
                         on the Box Plot should be added.
@@ -2366,12 +2440,14 @@ The basic syntax is the following, the `<...>` means optional parameters:

 The box-and-whiskers plot has the following interpretation: 
 - left vertical bar indicates the *minimum*,
- left whisker line starts at `max(Q1 - 1.5IQR, minimum)` and ends at lower quartile (Q1),
+- left whisker line starts at `max(Q1 - WS*IQR, minimum)` and ends at lower quartile (Q1),
 - diamond indicates mean,
 - vertical bar inside of the box indicates median,
- right whisker line starts at upper quartile (Q3) and ends at `min(Q3 + 1.5IQR, maximum)`,
+- right whisker line starts at upper quartile (Q3) and ends at `min(Q3 + WS*IQR, maximum)`,
 - right vertical bar indicates the *maximum*.

+The `WS` value is provided through `whiskerScale=` parameter. Default value is `1.5`.
+
 With above setup it may happen that 
 there is a gap between the minimum marker and the beginning of the left whisker 
 or 
@@ -2533,6 +2609,7 @@ The output can be seen in the `md` file.
  , vertical = 1
  , title = %nrstr(title1 J=C HEIGHT=3 "The VERTICAL plotting is cool, ...";)
  , footnote = %nrstr(footnote1 J=L HEIGHT=2 "... isn't it?";)
+  , whiskerScale = 1.5
  )

 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -4521,9 +4598,9 @@ semicolonN(X)
 
 ## `$bpklenght.` format/informat <a name="bpklenght-formats-49"></a> ######
 
-## >>> `bpklenght` format/informat: <<< <a name="bpklenght-format"></a> #######################
+## >>> `bpklength` format/informat: <<< <a name="bpklength-format"></a> #######################

-The **bpklenght** format and informats uses the `klength()` function
+The **bpklength** format and informats uses the `klength()` function
 to count the number of letters in a word. For empty string returns 0.


@@ -4533,9 +4610,9 @@ to count the number of letters in a word. For empty string returns 0.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas
 data work.count_letters;
  input x $ 32.;
-  n = input (x, bpklenght.);
-  c = input (x, $bpklenght.);
-  format x $bpklenght.;
+  n = input (x, bpklength.);
+  c = input (x, $bpklength.);
+  format x $bpklength.;
 cards;
 ż
 żó
@@ -4570,7 +4647,7 @@ data _null_;
  length x $ 32767;
  do i = 32767/3 to 0 by -1111, 10 to 0 by -1;
    x=repeat("空",i);
-    put x $bpklenght.;
+    put x $bpklength.;
  end;
 run; 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -4582,9 +4659,9 @@ run;
 
 ## `$bplenght.` format/informat <a name="bplenght-formats-50"></a> ######
 
-## >>> `bplenght` format/informat: <<< <a name="bplenght-format"></a> #######################
+## >>> `bplength` format/informat: <<< <a name="bplength-format"></a> #######################

-The **bplenght** format and informats use the `lengthn()` function
+The **bplength** format and informats use the `lengthn()` function
 to count the number of bytes in a word.


@@ -4594,9 +4671,9 @@ to count the number of bytes in a word.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~sas
 data work.count_bytes;
  input x $ 32.;
-  n = input (x, bplenght.);
-  c = input (x, $bplenght.);
-  format x $bplenght.;
+  n = input (x, bplength.);
+  c = input (x, $bplength.);
+  format x $bplength.;
 cards;
 ż
 żó
@@ -4631,7 +4708,7 @@ data _null_;
  length x $ 32767;
  do i = 32767/3 to 0 by -1111, 10 to 0 by -1;
    x=repeat("空",i);
-    put x $bplenght.;
+    put x $bplength.;
  end;
 run; 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -6382,7 +6459,7 @@ The basic syntax is the following, the `<...>` means optional parameters:

 3. `false` - *Required*, value returned when condition is false.

-4 `v=`     - *Optional*, v for verbose. If set to `1` extra notes
+* `v=`     - *Optional*, v for verbose. If set to `1` extra notes
              are printed.
 ---

@@ -7585,7 +7662,7 @@ The basic syntax is the following, the `<...>` means optional parameters:
 
 # License <a name="license"></a> ######
 
-Copyright (c) 2020 - 2023 Bartosz Jablonski
+Copyright (c) 2020 - 2025 Bartosz Jablonski

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/packages/baseplus.zip
+++ b/packages/baseplus.zip