diff --git a/ACM-Reference-Format.bst b/ACM-Reference-Format.bst
index ea3f35a..c47cb4c 100644
--- a/ACM-Reference-Format.bst
+++ b/ACM-Reference-Format.bst
@@ -3,7 +3,8 @@
 %%%  @BibTeX-style-file{
 %%%     author          = "Nelson H. F. Beebe, Boris Veytsman and Gerald Murray",
 %%%     version         = "2.1",
-%%%     date            = "14 June 2017",
+%%%     acmart-version  = "1.90",
+%%%     date            = "Mar 26 2023",
 %%%     filename        = "ACM-Reference-Format.bst",
 %%%     email           = "borisv@lk.net, boris@varphi.com",
 %%%     codetable       = "ISO/ASCII",
@@ -23,15 +24,18 @@ ENTRY
     author
     booktitle
     chapter
-    city     
-    date     
+    city
+    date
     edition
     editor
     eprint
+    eprinttype
+    eprintclass
     howpublished
     institution
     journal
     key
+    location
     month
     note
     number
@@ -48,7 +52,7 @@ ENTRY
         % New keys recognized
         issue         % UTAH: used in, e.g., ACM SIGSAM Bulletin and ACM Communications in Computer Algebra
         articleno
-	eid           
+        eid
         day           % UTAH: needed for newspapers, weeklies, bi-weeklies
         doi           % UTAH
         url           % UTAH
@@ -60,6 +64,7 @@ ENTRY
         isbn-13       % UTAH
         issn          % UTAH
         lccn          % UTAH
+	distinctURL   % whether to print url if doi is present
   }
   {}
   { label.year extra.label sort.year sort.label basic.label.year}
@@ -146,6 +151,16 @@ FUNCTION { empty.or.unknown }
   if$
 }
 
+FUNCTION { empty.or.zero }
+{
+  %% Examine the top entry and push 1 if it is empty, or is zero
+  duplicate$ empty$
+    { pop$ #1 }
+    { "0" = }
+  if$
+}
+
+
 FUNCTION { writeln }
 {
   %% In BibTeX style files, the sequences
@@ -423,6 +438,44 @@ FUNCTION { output.coden }       % UTAH
   if$
 }
 
+%
+% Sometimes articleno starts with the word 'Article' or 'Paper.
+% (this is a bug of acmdl, sigh)
+% We strip them.  We assume eid or articleno is already on stack
+%
+
+FUNCTION { strip.articleno.or.eid }
+{
+  't :=
+  t #1 #7 substring$ "Article" = 
+    {t #8 t text.length$ substring$ 't :=}
+    { }
+  if$
+  t #1 #7 substring$ "article" = 
+    {t #8 t text.length$ substring$ 't :=}
+    { }
+  if$
+  t #1 #5 substring$ "Paper" = 
+    {t #6 t text.length$ substring$ 't :=}
+    { }
+  if$
+  t #1 #5 substring$ "paper" = 
+    {t #6 t text.length$ substring$ 't :=}
+    { }
+  if$
+  % Strip any left trailing space or ~
+  t #1 #1 substring$ " " =
+    {t #2 t text.length$ substring$ 't :=}
+    { }
+  if$ 
+  t #1 #1 substring$ "~" =
+    {t #2 t text.length$ substring$ 't :=}
+    { }
+  if$
+  t 
+}
+
+
 FUNCTION { format.articleno }
 {
   articleno empty.or.unknown not eid empty.or.unknown not and
@@ -433,25 +486,25 @@ FUNCTION { format.articleno }
      { "" }
      {
         numpages empty.or.unknown
-          { "articleno or eid field, but no numpages field, in " 
+          { "articleno or eid field, but no numpages field, in "
             cite$ * warning$ }
           { }
         if$
-        eid empty.or.unknown 
-          { "Article \bibinfo{articleno}{" articleno * "}" * }
-          { "Article \bibinfo{articleno}{" eid * "}" * }
+        eid empty.or.unknown
+          { "Article \bibinfo{articleno}{" articleno strip.articleno.or.eid * "}" * }
+          { "Article \bibinfo{articleno}{" eid strip.articleno.or.eid * "}" * }
         if$
      }
   if$
 }
 
 FUNCTION { format.year }
-{ % push year string or "[n. d.]" onto output stack
+{ % push year string or "[n.\,d.]" onto output stack
   %% Because year is a mandatory field, we always force SOMETHING
   %% to be output
   "\bibinfo{year}{"
   year empty.or.unknown
-    { "[n. d.]" }
+    { "[n.\,d.]" }
     { year }
   if$
   *  "}" *
@@ -504,15 +557,14 @@ FUNCTION { strip.doi } % UTAH
   % result on the output stack, as recommended by CrossRef DOI
   % documentation.
   % For example, reduce "http://doi.acm.org/10.1145/1534530.1534545" to
-  % "10.1145/1534530.1534545".  That is later typeset and displayed as
-  % doi:10.1145/1534530.1534545 as the LAST item in the reference list
-  % entry.  Publisher Web sites wrap this with a suitable link to a real
-  % URL to resolve the DOI, and the master https://doi.org/ address is
-  % preferred, since publisher-specific URLs can disappear in response
-  % to economic events.  All journals are encouraged by the DOI
-  % authorities to use that typeset format and link procedures for
-  % uniformity across all publications that include DOIs in reference
-  % lists.
+  % "10.1145/1534530.1534545".  A suitable URL is later typeset and
+  % displayed as the LAST item in the reference list entry.  Publisher Web
+  % sites wrap this with a suitable link to a real URL to resolve the DOI,
+  % and the master https://doi.org/ address is preferred, since publisher-
+  % specific URLs can disappear in response to economic events.  All
+  % journals are encouraged by the DOI authorities to use that typeset
+  % format and link procedures for uniformity across all publications that
+  % include DOIs in reference lists.
   % The numeric prefix is guaranteed to start with "10.", so we use
   % that as a test.
   % 2017-02-04 Added stripping of https:// (Boris)
@@ -578,14 +630,11 @@ FUNCTION { output.doi } % UTAH
   doi empty.or.unknown
     { }
     {
-      %% NB: We want URLs at beginning of line to reduce likelihood of
-      %% BibTeX's nasty line wrapping after column 79, which then requires
-      %% manual (or automated) editing of the .bbl file to repair.
-      %% The \url{} macro strips percent-newlines, and is thus safe in
-      %% the presence of the line wrapping, but \path|...| and
-      %% \verb|...| do not.
-      "\showDOI{%" writeln
-      "\url{https://doi.org/" strip.doi * "}}" * writeln
+      %% Use \urldef here for the same reason it is used in output.url,
+      %% see output.url for further discussion.
+      "\urldef\tempurl%" writeln
+      "\url{https://doi.org/" strip.doi * "}" * writeln
+      "\showDOI{\tempurl}" writeln
     }
   if$
 }
@@ -655,7 +704,7 @@ FUNCTION { output.note } % UTAH
 { % return with stack empty
   note empty.or.unknown
     { }
-    { "\shownote{" note add.period$ * "}" * writeln }
+    { "\shownote{" note * "}" add.period$ * writeln }
   if$
 }
 
@@ -663,7 +712,7 @@ FUNCTION { output.note.check } % UTAH
 { % return with stack empty
   note empty.or.unknown
     { "empty note in " cite$ * warning$ }
-    { "\shownote{" note add.period$ * "}" * writeln }
+    { "\shownote{" note * "}" add.period$ * writeln }
   if$
 }
 
@@ -673,15 +722,22 @@ FUNCTION { output.eprint } %
     { }
     { "\showeprint"
          archiveprefix empty.or.unknown
-           { }
-           { "["  archiveprefix "l" change.case$ "]" * * * }
+           { eprinttype empty.or.unknown
+               { }
+               { "[" eprinttype "]" * * * }
+             if$
+           }
+           { "[" archiveprefix "l" change.case$ "]" * * * }
          if$
-         "{" *
+	 "{" eprint "}" * * *
          primaryclass empty.or.unknown
-           { }
-           { primaryclass "/" * *}
+           { eprintclass empty.or.unknown
+             { }
+             { "~[" eprintclass "]" * * * }
+             if$
+           }
+           { "~[" primaryclass "]" * * * }
          if$
-         eprint "}" * *
          writeln
     }
   if$
@@ -692,60 +748,34 @@ FUNCTION { output.eprint } %
 % Changes by BV 2011/04/15.  Do not output
 % url if doi is defined
 %
+%
+% Changes by BV 2021/11/26.  Output url even if doi is defined
+% if distinctURL is not zero.
+%
 FUNCTION { output.url } % UTAH
 { % return with stack untouched
   % output URL and associated lastaccessed fields
-  doi empty.or.unknown
+  doi empty.or.unknown distinctURL empty.or.zero not or
   {
     url empty.or.unknown
       { }
       {
-          %% NB: We want URLs at beginning of line to reduce likelihood of
-          %% BibTeX's nasty line wrapping after column 79, which would require
-          %% manual (or automated) editing of the .bbl file to repair.  However,
-          %% the \url{} macro handles the unwrapping job automatically.
+          %% Use \urldef, outside \showURL, so that %nn, #, etc in URLs work
+          %% correctly.  Put the actual URL on its own line to reduce the
+          %% likelihood of BibTeX's nasty line wrapping after column 79.
+          %% \url{} can undo this, but if that doesn't work for some reason
+          %% the .bbl file would have to be repaired manually.
+          "\urldef\tempurl%" writeln
+          "\url{" url * "}" * writeln
+
           "\showURL{%" writeln
           lastaccessed empty.or.unknown
             { "" }
             { "Retrieved " lastaccessed * " from " * }
           if$
-
-          %% The URL field may contain a semicolon-separated list of Web
-          %% addresses, and we locate and wrap each of them in \url{...}.
-          %% The simplistic approach of putting the entire list into the
-          %% macro argument is that the semicolons are typeset in a
-          %% typewriter font, and no space follows them.
-          %%
-          %% We therefore replace the original code
-          %%    "\url{" * url * "}}" * writeln
-          %% with this character-at-a-time loop:
-
-          "\url{" *
-
-          url 't :=                       % get modifiable copy of URL list
-
-          { t text.length$ }
-          {
-            t #1 #1 substring$ ";" =
-              {                         % then split argument at separator
-                "};" * writeln
-                "\url{"
-              }
-              {                         % else concatenate nonblank character to argument
-                t #1 #1 substring$ " " =
-                  { }
-                  { t #1 #1 substring$ * }
-                if$
-              }
-            if$
-
-            t #2 t text.length$ #1 - substring$ 't :=
-          }
-          while$
-
-          "}}" * writeln
+          "\tempurl}" * writeln
       }
-    if$
+      if$
   }
   { }
   if$
@@ -754,9 +784,9 @@ FUNCTION { output.url } % UTAH
 FUNCTION { output.year.check }
 { % warn if year empty, output top string and leave " YEAR<label>" on stack in mid-sentence
   year empty.or.unknown
-     { "empty year in " cite$ * warning$ 
+     { "empty year in " cite$ * warning$
        write$
-       " \bibinfo{year}{[n. d.]}"  
+       " \bibinfo{year}{[n.\,d.]}"
        "\natexlab{" extra.label * "}" * *
        mid.sentence 'output.state :=
      }
@@ -993,18 +1023,10 @@ FUNCTION { field.or.null }
 
 
 FUNCTION { emphasize }
-{ % emphasize a non-empty top string on the stack (WITHOUT italic correction)
-  duplicate$ empty.or.unknown
-    { pop$ "" }
-    { "{\em " swap$ * "}" * }
-  if$
-}
-
-FUNCTION { emphasize.with.italic.correction }
-{ % convert empty string to null string, or emphasize with a trailing italic correction
+{ % emphasize a non-empty top string on the stack
   duplicate$ empty.or.unknown
     { pop$ "" }
-    { "{\em " swap$ * "\/}" * }
+    { "\emph{" swap$ * "}" * }
   if$
 }
 
@@ -1246,35 +1268,25 @@ FUNCTION { n.dashify }
   while$
 }
 
-FUNCTION { format.btitle }
+FUNCTION { format.a.title.with.edition }
 {
   "\bibinfo{booktitle}{"
+  swap$ emphasize *
   edition empty.or.unknown
-  { title emphasize }
-  { title empty.or.unknown
-    { title emphasize } % jtb: what is this supposed to do ?!?
-    { "{\em " title * "\/} (\bibinfo{edition}{" * edition "l" change.case$ *
-    "} ed.)" * } % jtb: no parens for ed.
-    if$
-  }
+    'skip$
+    { " (\bibinfo{edition}{" * edition "l" change.case$ *
+      "} ed.)" * } % jtb: no parens for ed.
   if$
-  * "}" *
+  "}" *
 }
 
+FUNCTION { format.btitle }
+{ title format.a.title.with.edition }
+
 FUNCTION { format.emphasize.booktitle }
-{ % push "" or "{\em booktitle}" or "{\em booktitle}, (second ed.)" on stack
-  "\bibinfo{booktitle}{"
-  edition empty.or.unknown
-    { booktitle emphasize }
-    { booktitle empty.or.unknown
-      { "" }
-      { "{\em " booktitle * "} (\bibinfo{edition}{" *
-      edition "l" change.case$ * "} ed.)" * }
-      if$
-    }
-  if$
-  * "}" *
-}
+{ booktitle format.a.title.with.edition }
+
+
 
 FUNCTION { format.city }
 {
@@ -1285,7 +1297,7 @@ FUNCTION { format.city }
   duplicate$ empty.or.unknown
     { }
     {
-      city empty.or.unknown
+      city empty.or.unknown location empty.or.unknown and
         {
           date empty.or.unknown
             { }
@@ -1293,9 +1305,19 @@ FUNCTION { format.city }
           if$
         }
         {
-          date empty.or.unknown
-            { " (" * city * ")" * }
-            { " (" * city * ", " * date * ")" * }
+          location empty.or.unknown
+            {
+              date empty.or.unknown
+                { " (" * city * ")" * }
+                { " (" * city * ", " * date * ")" * }
+              if$
+            }
+            {
+              date empty.or.unknown
+                { " (" * location * ")" * }
+                { " (" * location * ", " * date * ")" * }
+              if$
+            }
           if$
         }
       if$
@@ -1352,7 +1374,19 @@ FUNCTION { format.series }
 {
   series empty.or.unknown
     {""}
-    {" {\em (\bibinfo{series}{" * series "})}" *}
+    {" \emph{(\bibinfo{series}{" * series "}" *
+     volume empty.or.unknown
+       {
+         number empty.or.unknown
+            {")}" *}
+            {", \bibinfo{number}{" number "})}" * * *}
+          if$
+       }
+       {", Vol.~\bibinfo{volume}{" volume "})}" * * *
+        "volume and number" number either.or.check
+       }
+     if$
+    }
   if$
 }
 
@@ -1436,7 +1470,12 @@ FUNCTION { format.pages.check.without.articleno }
   articleno empty.or.unknown eid empty.or.unknown and
     {
       pages missing$
-        { numpages }
+        {
+	   numpages empty.or.unknown
+	     {""}
+             { "\bibinfo{numpages}{" numpages * "}~pages" * }
+	  if$
+	}
         { format.pages }
       if$
     }
@@ -1499,14 +1538,16 @@ FUNCTION { format.articleno.numpages }
   %%     numpages, pages                -> "pages-value"
   %%     numpages                       -> "numpages-value"
   %%     pages                          -> "pages-value"
+  %%
+  %% We no longer issue warninig when missing articleno, but having numpages
 
   articleno empty.or.unknown eid empty.or.unknown and
     {
-      numpages empty.or.unknown
-        { }
-        { "numpages field, but no articleno or eid field, in "
-	  cite$ * warning$ }
-      if$
+%%      numpages empty.or.unknown
+%%        { }
+%%        { "numpages field, but no articleno or eid field, in "
+%%          cite$ * warning$ }
+%%      if$
       ""
     }
     {
@@ -1515,7 +1556,7 @@ FUNCTION { format.articleno.numpages }
           pages empty.or.unknown
             {
               "articleno or eid, but no pages or numpages field in "
-	         cite$ * warning$
+                 cite$ * warning$
               "" 'page.count :=
             }
             { reduce.pages.to.page.count }
@@ -1550,6 +1591,105 @@ FUNCTION {calc.format.page.count}
 }
 
 
+FUNCTION { journal.canon.abbrev }
+{
+  % Returns a canonical abbreviation for 'journal', or else 'journal'
+  % unchanged.
+  journal "ACM Computing Surveys"                                                                       = { "Comput. Surveys"                                 } {
+  journal "{ACM} Computing Surveys"                                                                     = { "Comput. Surveys"                                 } {
+  journal "ACM Transactions on Mathematical Software"                                                   = { "ACM Trans. Math. Software"                       } {
+  journal "{ACM} Transactions on Mathematical Software"                                                 = { "ACM Trans. Math. Software"                       } {
+  journal "ACM SIGNUM Newsletter"                                                                       = { "ACM SIGNUM Newslett."                            } {
+  journal "ACM {SIGNUM} Newsletter"                                                                     = { "ACM SIGNUM Newslett."                            } {
+  journal "{ACM} SIGNUM Newsletter"                                                                     = { "ACM SIGNUM Newslett."                            } {
+  journal "{ACM} {SIGNUM} Newsletter"                                                                   = { "ACM SIGNUM Newslett."                            } {
+  journal "American Journal of Sociology"                                                               = { "Amer. J. Sociology"                              } {
+  journal "American Mathematical Monthly"                                                               = { "Amer. Math. Monthly"                             } {
+  journal "American Mathematical Society Translations"                                                  = { "Amer. Math. Soc. Transl."                        } {
+  journal "Applied Mathematics and Computation"                                                         = { "Appl. Math. Comput."                             } {
+  journal "British Journal of Mathematical and Statistical Psychology"                                  = { "Brit. J. Math. Statist. Psych."                  } {
+  journal "Bulletin of the American Mathematical Society"                                               = { "Bull. Amer. Math. Soc."                          } {
+  journal "Canadian Mathematical Bulletin"                                                              = { "Canad. Math. Bull."                              } {
+  journal "Communications of the ACM"                                                                   = { "Commun. ACM"                                     } {
+  journal "Communications of the {ACM}"                                                                 = { "Commun. ACM"                                     } {
+  journal "Computers and Structures"                                                                    = { "Comput. \& Structures"                           } {
+  journal "Contemporary Mathematics"                                                                    = { "Contemp. Math."                                  } {
+  journal "Crelle's Journal"                                                                            = { "Crelle's J."                                     } {
+  journal "Giornale di Mathematiche"                                                                    = { "Giorn. Mat."                                     } {
+  journal "IEEE Transactions on Aerospace and Electronic Systems"                                       = { "IEEE Trans. Aerospace Electron. Systems"         } {
+  journal "{IEEE} Transactions on Aerospace and Electronic Systems"                                     = { "IEEE Trans. Aerospace Electron. Systems"         } {
+  journal "IEEE Transactions on Automatic Control"                                                      = { "IEEE Trans. Automat. Control"                    } {
+  journal "{IEEE} Transactions on Automatic Control"                                                    = { "IEEE Trans. Automat. Control"                    } {
+  journal "IEEE Transactions on Computers"                                                              = { "IEEE Trans. Comput."                             } {
+  journal "{IEEE} Transactions on Computers"                                                            = { "IEEE Trans. Comput."                             } {
+  journal "IMA Journal of Numerical Analysis"                                                           = { "IMA J. Numer. Anal."                             } {
+  journal "{IMA} Journal of Numerical Analysis"                                                         = { "IMA J. Numer. Anal."                             } {
+  journal "Information Processing Letters"                                                              = { "Inform. Process. Lett."                          } {
+  journal "International Journal for Numerical Methods in Engineering"                                  = { "Internat. J. Numer. Methods Engrg."              } {
+  journal "International Journal of Control"                                                            = { "Internat. J. Control"                            } {
+  journal "International Journal of Supercomputing Applications"                                        = { "Internat. J. Supercomputing Applic."             } {
+  journal "Journal of Computational Physics"                                                            = { "J. Comput. Phys."                                } {
+  journal "Journal of Computational and Applied Mathematics"                                            = { "J. Comput. Appl. Math."                          } {
+  journal "Journal of Computer and System Sciences"                                                     = { "J. Comput. System Sci."                          } {
+  journal "Journal of Mathematical Analysis and Applications"                                           = { "J. Math. Anal. Appl."                            } {
+  journal "Journal of Mathematical Physics"                                                             = { "J. Math. Phys."                                  } {
+  journal "Journal of Parallel and Distributed Computing"                                               = { "J. Parallel and Distrib. Comput."                } {
+  journal "Journal of Research of the National Bureau of Standards"                                     = { "J. Res. Nat. Bur. Standards"                     } {
+  journal "Journal of VLSI and Computer Systems"                                                        = { "J. VLSI Comput. Syst."                           } {
+  journal "Journal of {VLSI} and Computer Systems"                                                      = { "J. VLSI Comput. Syst."                           } {
+  journal "Journal of the ACM"                                                                          = { "J. ACM"                                          } {
+  journal "Journal of the American Statistical Association"                                             = { "J. Amer. Statist. Assoc."                        } {
+  journal "Journal of the Institute of Mathematics and its Applications"                                = { "J. Inst. Math. Appl."                            } {
+  journal "Journal of the Society for Industrial and Applied Mathematics"                               = { "J. Soc. Indust. Appl. Math."                     } {
+  journal "Journal of the Society for Industrial and Applied Mathematics, Series B, Numerical Analysis" = { "J. Soc. Indust. Appl. Math. Ser. B Numer. Anal." } {
+  journal "Linear Algebra and its Applications"                                                         = { "Linear Algebra Appl."                            } {
+  journal "Mathematica Scandinavica"                                                                    = { "Math. Scand."                                    } {
+  journal "Mathematical Tables and Other Aids to Computation"                                           = { "Math. Tables Aids Comput."                       } {
+  journal "Mathematics of Computation"                                                                  = { "Math. Comp."                                     } {
+  journal "Mathematische Annalen"                                                                       = { "Math. Ann."                                      } {
+  journal "Numerische Mathematik"                                                                       = { "Numer. Math."                                    } {
+  journal "Pacific Journal of Mathematics"                                                              = { "Pacific J. Math."                                } {
+  journal "Parallel Computing"                                                                          = { "Parallel Comput."                                } {
+  journal "Philosophical Magazine"                                                                      = { "Philos. Mag."                                    } {
+  journal "Proceedings of the American Mathematical Society"                                            = { "Proc. Amer. Math. Soc."                          } {
+  journal "Proceedings of the IEEE"                                                                     = { "Proc. IEEE"                                      } {
+  journal "Proceedings of the {IEEE}"                                                                   = { "Proc. IEEE"                                      } {
+  journal "Proceedings of the National Academy of Sciences of the USA"                                  = { "Proc. Nat. Acad. Sci. U. S. A."                  } {
+  journal "Quarterly Journal of Mathematics, Oxford, Series (2)"                                        = { "Quart. J. Math. Oxford Ser. (2)"                 } {
+  journal "Quarterly of Applied Mathematics"                                                            = { "Quart. Appl. Math."                              } {
+  journal "Review of the International Statisical Institute"                                            = { "Rev. Inst. Internat. Statist."                   } {
+  journal "SIAM Journal on Algebraic and Discrete Methods"                                              = { "SIAM J. Algebraic Discrete Methods"              } {
+  journal "{SIAM} Journal on Algebraic and Discrete Methods"                                            = { "SIAM J. Algebraic Discrete Methods"              } {
+  journal "SIAM Journal on Applied Mathematics"                                                         = { "SIAM J. Appl. Math."                             } {
+  journal "{SIAM} Journal on Applied Mathematics"                                                       = { "SIAM J. Appl. Math."                             } {
+  journal "SIAM Journal on Computing"                                                                   = { "SIAM J. Comput."                                 } {
+  journal "{SIAM} Journal on Computing"                                                                 = { "SIAM J. Comput."                                 } {
+  journal "SIAM Journal on Matrix Analysis and Applications"                                            = { "SIAM J. Matrix Anal. Appl."                      } {
+  journal "{SIAM} Journal on Matrix Analysis and Applications"                                          = { "SIAM J. Matrix Anal. Appl."                      } {
+  journal "SIAM Journal on Numerical Analysis"                                                          = { "SIAM J. Numer. Anal."                            } {
+  journal "{SIAM} Journal on Numerical Analysis"                                                        = { "SIAM J. Numer. Anal."                            } {
+  journal "SIAM Journal on Scientific and Statistical Computing"                                        = { "SIAM J. Sci. Statist. Comput."                   } {
+  journal "{SIAM} Journal on Scientific and Statistical Computing"                                      = { "SIAM J. Sci. Statist. Comput."                   } {
+  journal "SIAM Review"                                                                                 = { "SIAM Rev."                                       } {
+  journal "{SIAM} Review"                                                                               = { "SIAM Rev."                                       } {
+  journal "Software Practice and Experience"                                                            = { "Software Prac. Experience"                       } {
+  journal "Statistical Science"                                                                         = { "Statist. Sci."                                   } {
+  journal "The Computer Journal"                                                                        = { "Comput. J."                                      } {
+  journal "Transactions of the American Mathematical Society"                                           = { "Trans. Amer. Math. Soc."                         } {
+  journal "USSR Computational Mathematics and Mathematical Physics"                                     = { "U. S. S. R. Comput. Math. and Math. Phys."       } {
+  journal "{USSR} Computational Mathematics and Mathematical Physics"                                   = { "U. S. S. R. Comput. Math. and Math. Phys."       } {
+  journal "Zeitschrift fur Angewandte Mathematik und Mechanik"                                          = { "Z. Angew. Math. Mech."                           } {
+  journal "Zeitschrift fur Angewandte Mathematik und Physik"                                            = { "Z. Angew. Math. Phys."                           } {
+  journal
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+  } if$ } if$ } if$ } if$ } if$ } if$ } if$ } if$
+}
 
 FUNCTION { format.journal.volume.number.day.month.year }
 {
@@ -1559,429 +1699,11 @@ FUNCTION { format.journal.volume.number.day.month.year }
   % Format journal, volume, number, pages for article types.
   %
   journal empty.or.unknown
-    { "no journal in " cite$ * warning$
-      "" }
-%    { journal emphasize.with.italic.correction }
-     {
-       "\bibinfo{journal}{"
-           journal "Journal of the ACM" =
-       { "{\it J. ACM}" }
-       {
-           journal "American Mathematical Society Translations" =
-       { "{\it Amer. Math. Soc. Transl.}" }
-       {
-           journal "Bulletin of the American Mathematical Society" =
-       { "{\it Bull. Amer. Math. Soc.}" }
-       {
-           journal "Proceedings of the American Mathematical Society" =
-       { "{\it Proc. Amer. Math. Soc.}" }
-       {
-           journal "Transactions of the American Mathematical Society" =
-       { "{\it Trans. Amer. Math. Soc.}" }
-       {
-           journal "Communications of the {ACM}" =
-       { "{\it Commun. {ACM}}" }
-       {
-           journal "{ACM} Computing Surveys" =
-       { "{\it Comput. Surveys}" }
-       {
-           journal "{ACM} Transactions on Mathematical Software" =
-       { "{\it {ACM} Trans. Math. Software}" }
-       {
-           journal "{ACM} {SIGNUM} Newsletter" =
-       { "{\it {ACM} {SIGNUM} Newslett.}" }
-       {
-           journal "American Journal of Sociology" =
-       { "{\it Amer. J. Sociology}" }
-       {
-           journal "Journal of the American Statistical Association" =
-       { "{\it J. Amer. Statist. Assoc.}" }
-       {
-           journal "Applied Mathematics and Computation" =
-       { "{\it Appl. Math. Comput.}" }
-       {
-           journal "American Mathematical Monthly" =
-       { "{\it Amer. Math. Monthly}" }
-       {
-           journal "British Journal of Mathematical and Statistical Psychology" =
-       { "{\it Brit. J. Math. Statist. Psych.}" }
-       {
-           journal "Canadian Mathematical Bulletin" =
-       { "{\it Canad. Math. Bull.}" }
-       {
-           journal "Journal of Computational and Applied Mathematics" =
-       { "{\it J. Comput. Appl. Math.}" }
-       {
-           journal "Journal of Computational Physics" =
-       { "{\it J. Comput. Phys.}" }
-       {
-           journal "Computers and Structures" =
-       { "{\it Comput. \& Structures}" }
-       {
-           journal "The Computer Journal" =
-       { "{\it Comput. J.}" }
-       {
-           journal "Journal of Computer and System Sciences" =
-       { "{\it J. Comput. System Sci.}" }
-       {
-           journal "Contemporary Mathematics" =
-       { "{\it Contemp. Math.}" }
-       {
-           journal "Crelle's Journal" =
-       { "{\it Crelle's J.}" }
-       {
-           journal "Giornale di Mathematiche" =
-       { "{\it Giorn. Mat.}" }
-       {
-           journal "{IEEE} Transactions on Computers" =
-       { "{\it {IEEE} Trans. Comput.}" }
-       {
-           journal "{IEEE} Transactions on Automatic Control" =
-       { "{\it {IEEE} Trans. Automat. Control}" }
-       {
-           journal "Proceedings of the {IEEE}" =
-       { "{\it Proc. {IEEE}}" }
-       {
-           journal "{IEEE} Transactions on Aerospace and Electronic Systems" =
-       { "{\it {IEEE} Trans. Aerospace Electron. Systems}" }
-       {
-           journal "{IMA} Journal of Numerical Analysis" =
-       { "{\it {IMA} J. Numer. Anal.}" }
-       {
-           journal "Information Processing Letters" =
-       { "{\it Inform. Process. Lett.}" }
-       {
-           journal "Journal of the Institute of Mathematics and its Applications" =
-       { "{\it J. Inst. Math. Appl.}" }
-       {
-           journal "International Journal of Control" =
-       { "{\it Internat. J. Control}" }
-       {
-           journal "International Journal for Numerical Methods in Engineering" =
-       { "{\it Internat. J. Numer. Methods Engrg.}" }
-       {
-           journal "International Journal of Supercomputing Applications" =
-       { "{\it Internat. J. Supercomputing Applic.}" }
-       {
-           journal "Journal of Research of the National Bureau of Standards" =
-       { "{\it J. Res. Nat. Bur. Standards}" }
-       {
-           journal "Linear Algebra and its Applications" =
-       { "{\it Linear Algebra Appl.}" }
-       {
-           journal "Journal of Mathematical Analysis and Applications" =
-       { "{\it J. Math. Anal. Appl.}" }
-       {
-           journal "Mathematische Annalen" =
-       { "{\it Math. Ann.}" }
-       {
-           journal "Journal of Mathematical Physics" =
-       { "{\it J. Math. Phys.}" }
-       {
-           journal "Mathematics of Computation" =
-       { "{\it Math. Comp.}" }
-       {
-           journal "Mathematica Scandinavica" =
-       { "{\it Math. Scand.}" }
-       {
-           journal "Mathematical Tables and Other Aids to Computation" =
-       { "{\it Math. Tables Aids Comput.}" }
-       {
-           journal "Numerische Mathematik" =
-       { "{\it Numer. Math.}" }
-       {
-           journal "Pacific Journal of Mathematics" =
-       { "{\it Pacific J. Math.}" }
-       {
-           journal "Journal of Parallel and Distributed Computing" =
-       { "{\it J. Parallel and Distrib. Comput.}" }
-       {
-           journal "Parallel Computing" =
-       { "{\it Parallel Comput.}" }
-       {
-           journal "Philosophical Magazine" =
-       { "{\it Philos. Mag.}" }
-       {
-           journal "Proceedings of the National Academy of Sciences of the USA" =
-       { "{\it Proc. Nat. Acad. Sci. U. S. A.}" }
-       {
-           journal "Quarterly Journal of Mathematics, Oxford, Series (2)" =
-       { "{\it Quart. J. Math. Oxford Ser. (2)}" }
-       {
-           journal "Quarterly of Applied Mathematics" =
-       { "{\it Quart. Appl. Math.}" }
-       {
-           journal "Review of the International Statisical Institute" =
-       { "{\it Rev. Inst. Internat. Statist.}" }
-       {
-           journal "Journal of the Society for Industrial and Applied Mathematics" =
-       { "{\it J. Soc. Indust. Appl. Math.}" }
-       {
-           journal "Journal of the Society for Industrial and Applied Mathematics, Series B, Numerical Analysis" =
-       { "{\it J. Soc. Indust. Appl. Math. Ser. B Numer. Anal.}" }
-       {
-           journal "{SIAM} Journal on Algebraic and Discrete Methods" =
-       { "{\it {SIAM} J. Algebraic Discrete Methods}" }
-       {
-           journal "{SIAM} Journal on Applied Mathematics" =
-       { "{\it {SIAM} J. Appl. Math.}" }
-       {
-           journal "{SIAM} Journal on Computing" =
-       { "{\it {SIAM} J. Comput.}" }
-       {
-           journal "{SIAM} Journal on Matrix Analysis and Applications" =
-       { "{\it {SIAM} J. Matrix Anal. Appl.}" }
-       {
-           journal "{SIAM} Journal on Numerical Analysis" =
-       { "{\it {SIAM} J. Numer. Anal.}" }
-       {
-           journal "{SIAM} Review" =
-       { "{\it {SIAM} Rev.}" }
-       {
-           journal "{SIAM} Journal on Scientific and Statistical Computing" =
-       { "{\it {SIAM} J. Sci. Statist. Comput.}" }
-       {
-           journal "Software Practice and Experience" =
-       { "{\it Software Prac. Experience}" }
-       {
-           journal "Statistical Science" =
-       { "{\it Statist. Sci.}" }
-       {
-           journal "{USSR} Computational Mathematics and Mathematical Physics" =
-       { "{\it {U. S. S. R.} Comput. Math. and Math. Phys.}" }
-       {
-           journal "Journal of {VLSI} and Computer Systems" =
-       { "{\it J. {VLSI} Comput. Syst.}" }
-       {
-           journal "Zeitschrift fur Angewandte Mathematik und Mechanik" =
-       { "{\it Z. Angew. Math. Mech.}" }
-       {
-           journal "Zeitschrift fur Angewandte Mathematik und Physik" =
-       { "{\it Z. Angew. Math. Phys.}" }
-       {
-           journal "ACM Computing Surveys" =
-       { "{\it Comput. Surveys}" }
-       {
-           journal "ACM Transactions on Mathematical Software" =
-       { "{\it ACM Trans. Math. Software}" }
-       {
-           journal "ACM {SIGNUM} Newsletter" =
-       { "{\it ACM {SIGNUM} Newslett.}" }
-       {
-           journal "IEEE Transactions on Computers" =
-       { "{\it IEEE Trans. Comput.}" }
-       {
-           journal "IEEE Transactions on Automatic Control" =
-       { "{\it IEEE Trans. Automat. Control}" }
-       {
-           journal "Proceedings of the IEEE" =
-       { "{\it Proc. IEEE}" }
-       {
-           journal "IEEE Transactions on Aerospace and Electronic Systems" =
-       { "{\it IEEE Trans. Aerospace Electron. Systems}" }
-       {
-           journal "IMA Journal of Numerical Analysis" =
-       { "{\it IMA J. Numer. Anal.}" }
-       {
-           journal "SIAM Journal on Algebraic and Discrete Methods" =
-       { "{\it SIAM J. Algebraic Discrete Methods}" }
-       {
-           journal "SIAM Journal on Applied Mathematics" =
-       { "{\it SIAM J. Appl. Math.}" }
-       {
-           journal "SIAM Journal on Computing" =
-       { "{\it SIAM J. Comput.}" }
-       {
-           journal "SIAM Journal on Matrix Analysis and Applications" =
-       { "{\it SIAM J. Matrix Anal. Appl.}" }
-       {
-           journal "SIAM Journal on Numerical Analysis" =
-       { "{\it SIAM J. Numer. Anal.}" }
-       {
-           journal "SIAM Review" =
-       { "{\it SIAM Rev.}" }
-       {
-           journal "SIAM Journal on Scientific and Statistical Computing" =
-       { "{\it SIAM J. Sci. Statist. Comput.}" }
-       {
-           journal "USSR Computational Mathematics and Mathematical Physics" =
-       { "{\it U. S. S. R. Comput. Math. and Math. Phys.}" }
-       {
-           journal "Journal of VLSI and Computer Systems" =
-       { "{\it J. VLSI Comput. Syst.}" }
-       {
-           journal "Communications of the ACM" =
-       { "{\it Commun. ACM}" }
-       %% If no match with cases needing special handling, just output journal name
-       {  journal emphasize.with.italic.correction  }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-           }
-     if$
-     * "}" *
-         }
-    if$
+    { "no journal in " cite$ * warning$ "" }
+    { "\bibinfo{journal}{"
+      journal.canon.abbrev emphasize *
+      "}" * }
+  if$
 
   number empty.or.unknown
     {
@@ -2136,7 +1858,7 @@ FUNCTION { format.book.crossref }
           crossref * warning$
           "" *
         }
-        { "{\em " * series * "\/}" * }
+        { series emphasize * }
       if$
     }
     { key * }
@@ -2282,8 +2004,8 @@ FUNCTION { calc.basic.label }
     }
   if$
   duplicate$
-  year empty.or.unknown 
-    { "[n. d.]" }
+  year empty.or.unknown
+    { "{[n.\,d.]}" }
     { year field.or.null purify$ #-1 #4 substring$}
   if$
   *
@@ -2330,8 +2052,8 @@ FUNCTION { calc.label }
   %
   % save the year for sort processing afterwards (adding a, b, c, etc.)
   %
-  year empty.or.unknown 
-    { "[n. d.]" }
+  year empty.or.unknown
+    { "{[n.\,d.]}" }
     { year field.or.null purify$ #-1 #4 substring$}
   if$
   'label.year :=
@@ -2341,10 +2063,12 @@ FUNCTION { calc.label }
 FUNCTION { output.bibitem }
 {
   newline$
-  "\bibitem[\protect\citeauthoryear{" write$
-  calc.label write$
+  "\bibitem[" write$
+  calc.basic.label write$
+  "(" write$
   sort.year write$
-  "}]%" writeln
+  ")" write$
+  "]%" writeln
   "        {" write$
   cite$ write$
   "}" writeln
@@ -2601,7 +2325,10 @@ FUNCTION { inproceedings }
         { format.in.emphasize.booktitle format.city "booktitle"  output.check.dot.space
           format.series output.removenospace
           format.editors.fml output % BV 2011/09/27 Moved dot to comma
-          format.bvolume.noseries output
+          series empty.or.unknown
+              { format.bvolume.noseries output }
+              {}
+          if$
           new.sentence
           organization output
           publisher "publisher" bibinfo.output.check % jtb: require publisher (?)
@@ -2693,17 +2420,23 @@ FUNCTION { misc }
     { "\bibinfo{howpublished}{" howpublished "}" * * output }
   if$
   "" output.nonnull.dot.space
-  output.day.month.year
   calc.format.page.count output
   fin.block
   output.issue.doi.coden.isxn.lccn.url.eprint.note
   fin.entry
 }
 
-FUNCTION { online } { misc }
+FUNCTION { online } { manual }
 
-FUNCTION { game } { misc }
+FUNCTION { game } { manual }
 
+FUNCTION { artifactsoftware } { manual }
+
+FUNCTION { artifactdataset } { manual }
+
+FUNCTION { software } { manual }
+
+FUNCTION { dataset } { manual }
 
 FUNCTION { phdthesis }
 {
@@ -2714,7 +2447,7 @@ FUNCTION { phdthesis }
   new.block
   format.title emphasize "title" output.check  % NB: ACM style requires emphasized thesis title
   new.block
-  "\bibinfo{thesistype}{Ph.D. Dissertation}" format.thesis.type output
+  "\bibinfo{thesistype}{Ph.\,D. Dissertation}" format.thesis.type output
   new.sentence
   school "school" bibinfo.output.check
   address empty.or.unknown
@@ -2824,6 +2557,8 @@ FUNCTION { proceedings }
   fin.entry
 }
 
+FUNCTION { collection } { proceedings }
+
 FUNCTION { techreport }
 {
   output.bibitem
@@ -2895,6 +2630,99 @@ MACRO {nov}             {"Nov."}
 
 MACRO {dec}             {"Dec."}
 
+%%% ACM journal names
+
+MACRO {cie}  {"ACM Computers in Entertainment"}
+MACRO {csur}  {"ACM Computing Surveys"}
+MACRO {dgov}  {"Digital Government: Research and Practice"}
+MACRO {dtrap}  {"Digital Threats: Research and Practice"}
+MACRO {health}  {"ACM Transactions on Computing for Healthcare"}
+MACRO {imwut}  {"PACM on Interactive, Mobile, Wearable and Ubiquitous Technologies"}
+MACRO {jacm}  {"Journal of the ACM"}
+MACRO {jdiq}  {"ACM Journal of Data and Information Quality"}
+MACRO {jea}  {"ACM Journal of Experimental Algorithmics"}
+MACRO {jeric}  {"ACM Journal of Educational Resources in Computing"}
+MACRO {jetc}  {"ACM Journal on Emerging Technologies in Computing Systems"}
+MACRO {jocch}  {"ACM Journal on Computing and Cultural Heritage"}
+MACRO {pacmcgit}  {"Proceedings of the ACM on Computer Graphics and Interactive Techniques"}
+MACRO {pacmhci}  {"PACM on Human-Computer Interaction"}
+MACRO {pacmpl}  {"PACM on Programming Languages"}
+MACRO {pomacs}  {"PACM on Measurement and Analysis of Computing Systems"}
+MACRO {taas}  {"ACM Transactions on Autonomous and Adaptive Systems"}
+MACRO {taccess}  {"ACM Transactions on Accessible Computing"}
+MACRO {taco}  {"ACM Transactions on Architecture and Code Optimization"}
+MACRO {talg}  {"ACM Transactions on Algorithms"}
+MACRO {tallip}  {"ACM Transactions on Asian and Low-Resource Language Information Processing"}
+MACRO {tap}  {"ACM Transactions on Applied Perception"}
+MACRO {tcps}  {"ACM Transactions on Cyber-Physical Systems"}
+MACRO {tds}  {"ACM/IMS Transactions on Data Science"}
+MACRO {teac}  {"ACM Transactions on Economics and Computation"}
+MACRO {tecs}  {"ACM Transactions on Embedded Computing Systems"}
+MACRO {telo}  {"ACM Transactions on Evolutionary Learning"}
+MACRO {thri}  {"ACM Transactions on Human-Robot Interaction"}
+MACRO {tiis}  {"ACM Transactions on Interactive Intelligent Systems"}
+MACRO {tiot}  {"ACM Transactions on Internet of Things"}
+MACRO {tissec}  {"ACM Transactions on Information and System Security"}
+MACRO {tist}  {"ACM Transactions on Intelligent Systems and Technology"}
+MACRO {tkdd}  {"ACM Transactions on Knowledge Discovery from Data"}
+MACRO {tmis}  {"ACM Transactions on Management Information Systems"}
+MACRO {toce}  {"ACM Transactions on Computing Education"}
+MACRO {tochi}  {"ACM Transactions on Computer-Human Interaction"}
+MACRO {tocl}  {"ACM Transactions on Computational Logic"}
+MACRO {tocs}  {"ACM Transactions on Computer Systems"}
+MACRO {toct}  {"ACM Transactions on Computation Theory"}
+MACRO {todaes}  {"ACM Transactions on Design Automation of Electronic Systems"}
+MACRO {tods}  {"ACM Transactions on Database Systems"}
+MACRO {tog}  {"ACM Transactions on Graphics"}
+MACRO {tois}  {"ACM Transactions on Information Systems"}
+MACRO {toit}  {"ACM Transactions on Internet Technology"}
+MACRO {tomacs}  {"ACM Transactions on Modeling and Computer Simulation"}
+MACRO {tomm}   {"ACM Transactions on Multimedia Computing, Communications and Applications"}
+MACRO {tompecs}  {"ACM Transactions on Modeling and Performance Evaluation of Computing Systems"}
+MACRO {toms}  {"ACM Transactions on Mathematical Software"}
+MACRO {topc}  {"ACM Transactions on Parallel Computing"}
+MACRO {toplas}  {"ACM Transactions on Programming Languages and Systems"}
+MACRO {tops}  {"ACM Transactions on Privacy and Security"}
+MACRO {tos}  {"ACM Transactions on Storage"}
+MACRO {tosem}  {"ACM Transactions on Software Engineering and Methodology"}
+MACRO {tosn}  {"ACM Transactions on Sensor Networks"}
+MACRO {tqc}  {"ACM Transactions on Quantum Computing"}
+MACRO {trets}  {"ACM Transactions on Reconfigurable Technology and Systems"}
+MACRO {tsas}  {"ACM Transactions on Spatial Algorithms and Systems"}
+MACRO {tsc}  {"ACM Transactions on Social Computing"}
+MACRO {tslp}  {"ACM Transactions on Speech and Language Processing"}
+MACRO {tweb}  {"ACM Transactions on the Web"}
+
+%%% Some traditional macros
+MACRO {acmcs} {"ACM Computing Surveys"}
+
+MACRO {acta} {"Acta Informatica"}
+
+MACRO {cacm} {"Communications of the ACM"}
+
+MACRO {ibmjrd} {"IBM Journal of Research and Development"}
+
+MACRO {ibmsj} {"IBM Systems Journal"}
+
+MACRO {ieeese} {"IEEE Transactions on Software Engineering"}
+
+MACRO {ieeetc} {"IEEE Transactions on Computers"}
+
+MACRO {ieeetcad}
+ {"IEEE Transactions on Computer-Aided Design of Integrated Circuits"}
+
+MACRO {ipl} {"Information Processing Letters"}
+
+MACRO {jcss} {"Journal of Computer and System Sciences"}
+
+MACRO {scp} {"Science of Computer Programming"}
+
+MACRO {sicomp} {"SIAM Journal on Computing"}
+
+MACRO {toois} {"ACM Transactions on Office Information Systems"}
+
+MACRO {tcs} {"Theoretical Computer Science"}
+
 
 
 READ
@@ -3037,13 +2865,13 @@ FUNCTION { presort }
   % including organizations as the sort key; the following is stolen from
   % alpha.bst.
 
-  calc.label 
-  basic.label.year 
+  calc.label
+  basic.label.year
   swap$
-  "    " 
+  "    "
   swap$
   * *
-  "    " 
+  "    "
   *
   sortify
   year field.or.null purify$ #-1 #4 substring$ * % add year
@@ -3086,6 +2914,22 @@ ITERATE { presort }
 
 SORT             % by label, year, author/editor, title
 
+% From plainnat.bst
+STRINGS { longest.label }
+
+INTEGERS { longest.label.width number.label }
+
+FUNCTION {initialize.longest.label}
+{ "" 'longest.label :=
+  #0 int.to.chr$ 'last.label :=
+  "" 'next.extra :=
+  #0 'longest.label.width :=
+  #0 'last.extra.num :=
+  #0 'number.label :=
+}
+
+
+
 FUNCTION { initialize.extra.label.stuff }
 { #0 int.to.chr$ 'last.label :=
   "" 'next.extra :=
@@ -3099,8 +2943,6 @@ FUNCTION { forward.pass }
   % if two entries are the same (see presort)
 
   last.label
-  % OLD:calc.label year field.or.null purify$ #-1 #4 substring$ * % add year
-  % NEW:
   calc.basic.label year field.or.null purify$ #-1 #4 substring$ * % add year
   #1 entry.max$ substring$ =     % are they equal?
      { last.extra.num #1 + 'last.extra.num :=
@@ -3108,12 +2950,11 @@ FUNCTION { forward.pass }
      }
      { "a" chr.to.int$ 'last.extra.num :=
        "" 'extra.label :=
-       % OLD: calc.label year field.or.null purify$ #-1 #4 substring$ * % add year
-       % NEW:
        calc.basic.label year field.or.null purify$ #-1 #4 substring$ * % add year
        #1 entry.max$ substring$ 'last.label := % assign to last.label
      }
   if$
+  number.label #1 + 'number.label :=
 }
 
 FUNCTION { reverse.pass }
@@ -3127,6 +2968,8 @@ FUNCTION { reverse.pass }
 }
 
 EXECUTE {initialize.extra.label.stuff}
+EXECUTE {initialize.longest.label}
+
 
 ITERATE {forward.pass}
 
@@ -3167,7 +3010,7 @@ FUNCTION { begin.bib }
     'skip$
     { preamble$ writeln }
   if$
-  "\begin{thebibliography}{00}" writeln
+  "\begin{thebibliography}{" number.label int.to.str$ * "}" * writeln
   ""                                                                         writeln
   "%%% ====================================================================" writeln
   "%%% NOTE TO THE USER: you can override these defaults by providing"       writeln
diff --git a/acmart.cls b/acmart.cls
index ef5b35c..b6ea2e7 100644
--- a/acmart.cls
+++ b/acmart.cls
@@ -38,7 +38,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{acmart}
-[2023/11/05 v2.00 Typesetting articles for the Association for Computing Machinery]
+[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery]
 \def\@classname{acmart}
 \InputIfFileExists{acmart-preload-hook.tex}{%
   \ClassWarning{\@classname}{%
@@ -47,13 +47,13 @@
 \RequirePackage{xkeyval}
 \RequirePackage{xstring}
 \RequirePackage{iftex}
-\define@choicekey*+{acmart.cls}{format}[\ACM@format\ACM@format@nr]{%
+\define@choicekey*+{\@classname.cls}{format}[\ACM@format\ACM@format@nr]{%
   manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph,
   sigplan, sigchi, sigchi-a, acmengage, acmcp}[manuscript]{}{%
   \ClassError{\@classname}{The option format must be manuscript,
     acmsmall, acmlarge, acmtog, sigconf, siggraph,
     sigplan, sigchi or sigchi-a}}
-\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{acmart.cls}{format=#1}}}
+\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{\@classname.cls}{format=#1}}}
 \@DeclareACMFormat{manuscript}
 \@DeclareACMFormat{acmsmall}
 \@DeclareACMFormat{acmlarge}
@@ -66,7 +66,7 @@
 \@DeclareACMFormat{acmengage}
 \@DeclareACMFormat{acmcp}
 \ExecuteOptionsX{format}
-\define@boolkey+{acmart.cls}[@ACM@]{screen}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{screen}[true]{%
   \if@ACM@screen
     \PackageInfo{\@classname}{Using screen mode}%
   \else
@@ -74,7 +74,7 @@
   \fi}{\PackageError{\@classname}{The option screen can be either true or
     false}}
 \ExecuteOptionsX{screen=false}
-\define@boolkey+{acmart.cls}[@ACM@]{urlbreakonhyphens}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{urlbreakonhyphens}[true]{%
   \if@ACM@urlbreakonhyphens
     \PackageInfo{\@classname}{Using breaking urls on hyphens}%
   \else
@@ -82,7 +82,7 @@
   \fi}{\PackageError{\@classname}{The option urlbreakonhyphens can be either true or
     false}}
 \ExecuteOptionsX{urlbreakonhyphens=true}
-\define@boolkey+{acmart.cls}[@ACM@]{acmthm}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{acmthm}[true]{%
   \if@ACM@acmthm
     \PackageInfo{\@classname}{Requiring acmthm}%
   \else
@@ -90,7 +90,7 @@
   \fi}{\PackageError{\@classname}{The option acmthm can be either true or
     false}}
 \ExecuteOptionsX{acmthm=true}
-\define@boolkey+{acmart.cls}[@ACM@]{review}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{review}[true]{%
   \if@ACM@review
     \PackageInfo{\@classname}{Using review mode}%
     \AtBeginDocument{\@ACM@printfoliostrue}%
@@ -99,7 +99,7 @@
   \fi}{\PackageError{\@classname}{The option review can be either true or
     false}}
 \ExecuteOptionsX{review=false}
-\define@boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{authorversion}[true]{%
   \if@ACM@authorversion
     \PackageInfo{\@classname}{Using authorversion mode}%
   \else
@@ -107,7 +107,7 @@
   \fi}{\PackageError{\@classname}{The option authorversion can be either true or
     false}}
 \ExecuteOptionsX{authorversion=false}
-\define@boolkey+{acmart.cls}[@ACM@]{nonacm}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{nonacm}[true]{%
   \if@ACM@nonacm
     \PackageInfo{\@classname}{Using nonacm mode}%
     \AtBeginDocument{\@ACM@printacmreffalse}%
@@ -119,15 +119,15 @@
   \fi}{\PackageError{\@classname}{The option nonacm can be either true or
     false}}
 \ExecuteOptionsX{nonacm=false}
-\define@boolkey+{acmart.cls}[@ACM@]{balance}[true]{}{%
+\define@boolkey+{\@classname.cls}[@ACM@]{balance}[true]{}{%
   \PackageError{\@classname}{The option balance can be either true or
     false}}
 \ExecuteOptionsX{balance}
-\define@boolkey+{acmart.cls}[@ACM@]{pbalance}[true]{}{%
+\define@boolkey+{\@classname.cls}[@ACM@]{pbalance}[true]{}{%
   \PackageError{\@classname}{The option pbalance can be either true or
     false}}
 \ExecuteOptionsX{pbalance=false}
-\define@boolkey+{acmart.cls}[@ACM@]{natbib}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{natbib}[true]{%
   \if@ACM@natbib
     \PackageInfo{\@classname}{Explicitly selecting natbib mode}%
   \else
@@ -135,7 +135,7 @@
   \fi}{\PackageError{\@classname}{The option natbib can be either true or
     false}}
 \ExecuteOptionsX{natbib=true}
-\define@boolkey+{acmart.cls}[@ACM@]{anonymous}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{anonymous}[true]{%
   \if@ACM@anonymous
     \PackageInfo{\@classname}{Using anonymous mode}%
   \else
@@ -143,7 +143,7 @@
   \fi}{\PackageError{\@classname}{The option anonymous can be either true or
     false}}
 \ExecuteOptionsX{anonymous=false}
-\define@boolkey+{acmart.cls}[@ACM@]{timestamp}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{timestamp}[true]{%
   \if@ACM@timestamp
     \PackageInfo{\@classname}{Using timestamp mode}%
   \else
@@ -151,7 +151,7 @@
   \fi}{\PackageError{\@classname}{The option timestamp can be either true or
     false}}
 \ExecuteOptionsX{timestamp=false}
-\define@boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{authordraft}[true]{%
   \if@ACM@authordraft
     \PackageInfo{\@classname}{Using authordraft mode}%
     \@ACM@timestamptrue
@@ -179,6 +179,7 @@
 \newif\if@ACM@manuscript
 \newif\if@ACM@journal
 \newif\if@ACM@journal@bibstrip
+\newif\if@ACM@journal@bibstrip@or@tog
 \newif\if@ACM@sigchiamode
 \newif\if@ACM@engage
 \@ACM@engagefalse
@@ -188,13 +189,13 @@
 \ClassWarning{\@classname}{%
   The format siggraph is now obsolete.\MessageBreak
   I am switching to sigconf.}
-  \setkeys{acmart.cls}{format=sigconf}
+  \setkeys{\@classname.cls}{format=sigconf}
 \fi
 \ifnum\ACM@format@nr=7\relax % sigchi
 \ClassWarning{\@classname}{%
   The format sigchi is now obsolete.\MessageBreak
   I am switching to sigconf.}
-  \setkeys{acmart.cls}{format=sigconf}
+  \setkeys{\@classname.cls}{format=sigconf}
 \fi
 \ifnum\ACM@format@nr=8\relax % sigchi
 \ClassWarning{\@classname}{%
@@ -224,6 +225,7 @@
   \@ACM@journaltrue
 \or % acmtog
   \@ACM@journaltrue
+  \@ACM@journal@bibstrip@or@togtrue
 \or % sigconf
   \@ACM@journalfalse
 \or % siggraph
@@ -244,7 +246,8 @@
   \AtBeginDocument{\@ACM@printacmreffalse}%
 \fi
 \if@ACM@journal
- \@ACM@journal@bibstriptrue
+  \@ACM@journal@bibstriptrue
+  \@ACM@journal@bibstrip@or@togtrue
 \else
  \@ACM@journal@bibstripfalse
 \fi
@@ -543,7 +546,6 @@
       \fi}%
   \fi
   \ignorespaces}
-\def\@seccntformat#1{\csname the#1\endcsname\quad}
 \def\@ssect#1#2#3#4#5{%
   \@tempskipa #3\relax
   \ifdim \@tempskipa>\z@
@@ -556,6 +558,7 @@
     \def\@svsechd{#4{\hskip #1\relax #5}}%
   \fi
   \@xsect{#3}}
+\def\@seccntformat#1{\csname the#1\endcsname\quad}
 \def\@starttoc#1#2{\begingroup\makeatletter
   \setTrue{#1}%
   \par\removelastskip\vskip\z@skip
@@ -1128,9 +1131,9 @@
   TOMPECS,%
   TOMS,%
   TOPC,%
-  TOPS,%
   TOPLAS,%
   TOPML,%
+  TOPS,%
   TORS,%
   TOS,%
   TOSEM,%
@@ -1148,6 +1151,7 @@
   \def\@journalName{ACM Journal on Computing and Sustainable Societies}%
   \def\@journalNameShort{ACM J. Comput. Sustain. Soc.}%
   \def\@permissionCodeOne{2834-5533}%
+  \def\@permissionCodeTwo{2834-5533}%
 \or % CIE
   \def\@journalName{ACM Computers in Entertainment}%
   \def\@journalNameShort{ACM Comput. Entertain.}%
@@ -1156,18 +1160,22 @@
   \def\@journalName{ACM Computing Surveys}%
   \def\@journalNameShort{ACM Comput. Surv.}%
   \def\@permissionCodeOne{0360-0300}%
+  \def\@permissionCodeTwo{1557-7341}%
 \or % DGOV
   \def\@journalName{Digital Government: Research and Practice}%
   \def\@journalNameShort{Digit. Gov. Res. Pract.}%
   \def\@permissionCodeOne{2639-0175}%
+  \def\@permissionCodeTwo{2639-0175}%
 \or % DLT
   \def\@journalName{Distributed Ledger Technologies: Research and Practice}%
   \def\@journalNameShort{Distrib. Ledger Technol.}%
   \def\@permissionCodeOne{2769-6472}%
+  \def\@permissionCodeTwo{2769-6480}%
 \or % DTRAP
   \def\@journalName{Digital Threats: Research and Practice}%
   \def\@journalNameShort{Digit. Threat. Res. Pract.}%
   \def\@permissionCodeOne{2576-5337}%
+  \def\@permissionCodeTwo{2576-5337}%
 \or % FAC
   \def\@journalName{Formal Aspects of Computing}%
   \def\@journalNameShort{Form. Asp. Comput.}%
@@ -1177,31 +1185,37 @@
   \def\@journalName{ACM Games: Research and Practice}%
   \def\@journalNameShort{ACM Games}%
   \def\@permissionCodeOne{2832-5516}%
+  \def\@permissionCodeTwo{2832-5516}%
 \or % HEALTH
   \def\@journalName{ACM Transactions on Computing for Healthcare}%
   \def\@journalNameShort{ACM Trans. Comput. Healthcare}%
   \def\@permissionCodeOne{2637-8051}%
+  \def\@permissionCodeTwo{2637-8051}%
 \or % IMWUT
   \def\@journalName{Proceedings of the ACM on Interactive, Mobile,
     Wearable and Ubiquitous Technologies}%
   \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}%
   \def\@permissionCodeOne{2474-9567}%
+  \def\@permissionCodeTwo{2474-9567}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % JACM
   \def\@journalName{Journal of the ACM}%
   \def\@journalNameShort{J. ACM}%
   \def\@permissionCodeOne{0004-5411}%
+  \def\@permissionCodeTwo{1557-735X}%
 \or % JATS
   \def\@journalName{Journal on Autonomous Transportation Systems}%
   \def\@journalNameShort{ACM J. Auton. Transport. Syst.}%
   \def\@permissionCodeOne{2833-0528}%
+  \def\@permissionCodeTwo{2833-0528}%
 \or % JDIQ
   \def\@journalName{ACM Journal of Data and Information Quality}%
   \def\@journalNameShort{ACM J. Data Inform. Quality}%
   \def\@permissionCodeOne{1936-1955}%
+  \def\@permissionCodeTwo{1936-1963}%
 \or % JDS
-  \def\@journalName{ACM/JMS Journal of Data Science}%
+  \def\@journalName{ACM/IMS Journal of Data Science}%
   \def\@journalNameShort{ACM/IMS J. Data Sci.}%
   \def\@permissionCodeOne{2831-3194}%
   \def\@permissionCodeTwo{2831-3194}%
@@ -1209,6 +1223,7 @@
   \def\@journalName{ACM Journal of Experimental Algorithmics}%
   \def\@journalNameShort{ACM J. Exp. Algor.}%
   \def\@permissionCodeOne{1084-6654}%
+  \def\@permissionCodeTwo{1084-6654}%
 \or % JERIC
   \def\@journalName{ACM Journal of Educational Resources in Computing}%
   \def\@journalNameShort{ACM J. Edu. Resources in Comput.}%
@@ -1217,6 +1232,7 @@
   \def\@journalName{ACM Journal on Emerging Technologies in Computing Systems}%
   \def\@journalNameShort{ACM J. Emerg. Technol. Comput. Syst.}%
   \def\@permissionCodeOne{1550-4832}%
+  \def\@permissionCodeTwo{1550-4840}%
 \or % JOCCH
   \def\@journalName{ACM Journal on Computing and Cultural Heritage}%
   \def\@journalNameShort{ACM J. Comput. Cult. Herit.}%
@@ -1226,52 +1242,62 @@
   \def\@journalName{ACM Journal on Responsible Computing}%
   \def\@journalNameShort{ACM J. Responsib. Comput.}%
   \def\@permissionCodeOne{2832-0565}%
+  \def\@permissionCodeTwo{2832-0565}%
 \or % PACMCGIT
   \def\@journalName{Proceedings of the ACM on Computer Graphics and Interactive Techniques}%
   \def\@journalNameShort{Proc. ACM Comput. Graph. Interact. Tech.}%
   \def\@permissionCodeOne{2577-6193}%
+  \def\@permissionCodeTwo{2577-6193}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMHCI
   \def\@journalName{Proceedings of the ACM on Human-Computer Interaction}%
   \def\@journalNameShort{Proc. ACM Hum.-Comput. Interact.}%
   \def\@permissionCodeOne{2573-0142}%
+  \def\@permissionCodeTwo{2573-0142}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMMOD
   \def\@journalName{Proceedings of the ACM on Management of Data}%
   \def\@journalNameShort{Proc. ACM Manag. Data}%
   \def\@permissionCodeOne{2836-6573}%
+  \def\@permissionCodeTwo{2836-6573}%
 \or % PACMNET
   \def\@journalName{Proceedings of the ACM on Networkng}%
   \def\@journalNameShort{Proc. ACM Netw.}%
   \def\@permissionCodeOne{2834-5509}%
+  \def\@permissionCodeTwo{2834-5509}%
 \or % PACMPL
   \def\@journalName{Proceedings of the ACM on Programming Languages}%
   \def\@journalNameShort{Proc. ACM Program. Lang.}%
   \def\@permissionCodeOne{2475-1421}%
+  \def\@permissionCodeTwo{2475-1421}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMSE
   \def\@journalName{Proceedings of the ACM on Software Engineering}%
   \def\@journalNameShort{Proc. ACM Softw. Eng.}%
   \def\@permissionCodeOne{2994-970X}%
+  \def\@permissionCodeTwo{2994-970X}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % POMACS
   \def\@journalName{Proceedings of the ACM on Measurement and Analysis of Computing Systems}%
   \def\@journalNameShort{Proc. ACM Meas. Anal. Comput. Syst.}%
   \def\@permissionCodeOne{2476-1249}%
+  \def\@permissionCodeTwo{2476-1249}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % TAAS
   \def\@journalName{ACM Transactions on Autonomous and Adaptive Systems}%
   \def\@journalNameShort{ACM Trans. Autonom. Adapt. Syst.}%
   \def\@permissionCodeOne{1556-4665}%
+  \def\@permissionCodeTwo{1556-4703}%
 \or % TACCESS
   \def\@journalName{ACM Transactions on Accessible Computing}%
   \def\@journalNameShort{ACM Trans. Access. Comput.}%
   \def\@permissionCodeOne{1936-7228}%
+  \def\@permissionCodeTwo{1936-7236}%
 \or % TACO
   \def\@journalName{ACM Transactions on Architecture and Code Optimization}%
   \def\@journalNameShort{ACM Trans. Arch. Code Optim.}%
@@ -1281,18 +1307,22 @@
   \def\@journalName{ACM Transactions on Algorithms}%
   \def\@journalNameShort{ACM Trans. Algor.}%
   \def\@permissionCodeOne{1549-6325}%
+  \def\@permissionCodeTwo{1549-6333}%
 \or % TALLIP
   \def\@journalName{ACM Transactions on Asian and Low-Resource Language Information Processing}%
   \def\@journalNameShort{ACM Trans. Asian Low-Resour. Lang. Inf. Process.}%
   \def\@permissionCodeOne{2375-4699}%
+  \def\@permissionCodeTwo{2375-4702}%
 \or % TAP
   \def\@journalName{ACM Transactions on Applied Perception}%
   \def\@journalNameShort{ACM Trans. Appl. Percept.}%
   \def\@permissionCodeOne{1544-3558}%
+  \def\@permissionCodeTwo{1544-3965}%
 \or % TCPS
   \def\@journalName{ACM Transactions on Cyber-Physical Systems}%
   \def\@journalNameShort{ACM Trans. Cyber-Phys. Syst.}%
   \def\@permissionCodeOne{2378-962X}%
+  \def\@permissionCodeTwo{2378-9638}%
 \or % TDS
   \def\@journalName{ACM/IMS Transactions on Data Science}%
   \def\@journalNameShort{ACM/IMS Trans. Data Sci.}%
@@ -1301,26 +1331,32 @@
   \def\@journalName{ACM Transactions on Economics and Computation}%
   \def\@journalNameShort{ACM Trans. Econ. Comput.}%
   \def\@permissionCodeOne{2167-8375}%
+  \def\@permissionCodeTwo{2167-8383}%
 \or % TECS
   \def\@journalName{ACM Transactions on Embedded Computing Systems}%
   \def\@journalNameShort{ACM Trans. Embedd. Comput. Syst.}%
   \def\@permissionCodeOne{1539-9087}%
+  \def\@permissionCodeTwo{1558-3465}%
 \or % TELO
-  \def\@journalName{ACM Transactions on Evolutionary Learning}%
-  \def\@journalNameShort{ACM Trans. Evol. Learn.}%
-  \def\@permissionCodeOne{2688-3007}%
+  \def\@journalName{ACM Transactions on Evolutionary Learning and Optimization}%
+  \def\@journalNameShort{ACM Trans. Evol. Learn. Optim.}%
+  \def\@permissionCodeOne{2688-299X}%
+  \def\@permissionCodeTwo{2688-3007}%
 \or % THRI
   \def\@journalName{ACM Transactions on Human-Robot Interaction}%
   \def\@journalNameShort{ACM Trans. Hum.-Robot Interact.}%
   \def\@permissionCodeOne{2573-9522}%
+  \def\@permissionCodeTwo{2573-9522}%
 \or % TIIS
   \def\@journalName{ACM Transactions on Interactive Intelligent Systems}%
   \def\@journalNameShort{ACM Trans. Interact. Intell. Syst.}%
   \def\@permissionCodeOne{2160-6455}%
+  \def\@permissionCodeTwo{2160-6463}%
 \or % TIOT
   \def\@journalName{ACM Transactions on Internet of Things}%
   \def\@journalNameShort{ACM Trans. Internet Things}%
   \def\@permissionCodeOne{2577-6207}%
+  \def\@permissionCodeTwo{2577-6207}%
 \or % TISSEC
   \def\@journalName{ACM Transactions on Information and System Security}%
   \def\@journalNameShort{ACM Trans. Info. Syst. Sec.}%
@@ -1329,54 +1365,67 @@
   \def\@journalName{ACM Transactions on Intelligent Systems and Technology}%
   \def\@journalNameShort{ACM Trans. Intell. Syst. Technol.}%
   \def\@permissionCodeOne{2157-6904}%
+  \def\@permissionCodeTwo{2157-6912}%
 \or % TKDD
   \def\@journalName{ACM Transactions on Knowledge Discovery from Data}%
   \def\@journalNameShort{ACM Trans. Knowl. Discov. Data.}%
   \def\@permissionCodeOne{1556-4681}%
+  \def\@permissionCodeTwo{1556-472X}%
 \or % TMIS
   \def\@journalName{ACM Transactions on Management Information Systems}%
   \def\@journalNameShort{ACM Trans. Manag. Inform. Syst.}%
   \def\@permissionCodeOne{2158-656X}%
+  \def\@permissionCodeTwo{2158-6578}%
 \or % TOCE
   \def\@journalName{ACM Transactions on Computing Education}%
   \def\@journalNameShort{ACM Trans. Comput. Educ.}%
   \def\@permissionCodeOne{1946-6226}%
+  \def\@permissionCodeTwo{1946-6226}%
 \or % TOCHI
   \def\@journalName{ACM Transactions on Computer-Human Interaction}%
   \def\@journalNameShort{ACM Trans. Comput.-Hum. Interact.}%
   \def\@permissionCodeOne{1073-0516}%
+  \def\@permissionCodeTwo{1557-7325}%
 \or % TOCL
   \def\@journalName{ACM Transactions on Computational Logic}%
   \def\@journalNameShort{ACM Trans. Comput. Logic}%
   \def\@permissionCodeOne{1529-3785}%
+  \def\@permissionCodeTwo{1557-945X}%
 \or % TOCS
   \def\@journalName{ACM Transactions on Computer Systems}%
   \def\@journalNameShort{ACM Trans. Comput. Syst.}%
   \def\@permissionCodeOne{0734-2071}%
+  \def\@permissionCodeTwo{1557-7333}%
 \or % TOCT
   \def\@journalName{ACM Transactions on Computation Theory}%
   \def\@journalNameShort{ACM Trans. Comput. Theory}%
   \def\@permissionCodeOne{1942-3454}%
+  \def\@permissionCodeTwo{1942-3462}%
 \or % TODAES
   \def\@journalName{ACM Transactions on Design Automation of Electronic Systems}%
   \def\@journalNameShort{ACM Trans. Des. Autom. Electron. Syst.}%
   \def\@permissionCodeOne{1084-4309}%
+  \def\@permissionCodeTwo{1557-7309}%
 \or % TODS
   \def\@journalName{ACM Transactions on Database Systems}%
   \def\@journalNameShort{ACM Trans. Datab. Syst.}%
   \def\@permissionCodeOne{0362-5915}%
+  \def\@permissionCodeTwo{1557-4644}%
 \or % TOG
   \def\@journalName{ACM Transactions on Graphics}%
   \def\@journalNameShort{ACM Trans. Graph.}%
-  \def\@permissionCodeOne{0730-0301}
+  \def\@permissionCodeOne{0730-0301}%
+  \def\@permissionCodeTwo{1557-7368}%
 \or % TOIS
   \def\@journalName{ACM Transactions on Information Systems}%
   \def\@journalNameShort{ACM Trans. Inf. Syst.}%
   \def\@permissionCodeOne{1046-8188}%
+  \def\@permissionCodeTwo{1558-2868}%
 \or % TOIT
   \def\@journalName{ACM Transactions on Internet Technology}%
   \def\@journalNameShort{ACM Trans. Internet Technol.}%
   \def\@permissionCodeOne{1533-5399}%
+  \def\@permissionCodeTwo{1557-6051}%
 \or % TOMACS
   \def\@journalName{ACM Transactions on Modeling and Computer Simulation}%
   \def\@journalNameShort{ACM Trans. Model. Comput. Simul.}%
@@ -1391,67 +1440,82 @@
   \def\@journalName{ACM Transactions on Modeling and Performance Evaluation of Computing Systems}%
   \def\@journalNameShort{ACM Trans. Model. Perform. Eval. Comput. Syst.}%
   \def\@permissionCodeOne{2376-3639}%
+  \def\@permissionCodeTwo{2376-3647}%
 \or % TOMS
   \def\@journalName{ACM Transactions on Mathematical Software}%
   \def\@journalNameShort{ACM Trans. Math. Softw.}%
   \def\@permissionCodeOne{0098-3500}%
+  \def\@permissionCodeTwo{1557-7295}%
 \or % TOPC
   \def\@journalName{ACM Transactions on Parallel Computing}%
   \def\@journalNameShort{ACM Trans. Parallel Comput.}%
   \def\@permissionCodeOne{2329-4949}%
   \def\@permissionCodeTwo{2329-4957}%
-\or % TOPS
-  \def\@journalName{ACM Transactions on Privacy and Security}%
-  \def\@journalNameShort{ACM Trans. Priv. Sec.}%
-  \def\@permissionCodeOne{2471-2566}%
 \or % TOPLAS
   \def\@journalName{ACM Transactions on Programming Languages and Systems}%
   \def\@journalNameShort{ACM Trans. Program. Lang. Syst.}%
   \def\@permissionCodeOne{0164-0925}%
+  \def\@permissionCodeTwo{1558-4593}%
 \or % TOPML
   \def\@journalName{ACM Transactions on Probabilistic Machine Learning}%
   \def\@journalNameShort{ACM Trans. Probab. Mach. Learn.}%
   \def\@permissionCodeOne{2836-8924}%
+  \def\@permissionCodeTwo{2836-8924}%
+\or % TOPS
+  \def\@journalName{ACM Transactions on Privacy and Security}%
+  \def\@journalNameShort{ACM Trans. Priv. Sec.}%
+  \def\@permissionCodeOne{2471-2566}%
+  \def\@permissionCodeTwo{2471-2574}%
 \or % TORS
   \def\@journalName{ACM Transactions on Recommender Systems}%
   \def\@journalNameShort{ACM Trans. Recomm. Syst.}%
   \def\@permissionCodeOne{2770-6699}%
+  \def\@permissionCodeTwo{2770-6699}%
 \or % TOS
   \def\@journalName{ACM Transactions on Storage}%
   \def\@journalNameShort{ACM Trans. Storage}%
   \def\@permissionCodeOne{1553-3077}%
+  \def\@permissionCodeTwo{1553-3093}%
 \or % TOSEM
   \def\@journalName{ACM Transactions on Software Engineering and Methodology}%
   \def\@journalNameShort{ACM Trans. Softw. Eng. Methodol.}%
   \def\@permissionCodeOne{1049-331X}%
+  \def\@permissionCodeTwo{1557-7392}%
 \or % TOSN
   \def\@journalName{ACM Transactions on Sensor Networks}%
   \def\@journalNameShort{ACM Trans. Sensor Netw.}%
   \def\@permissionCodeOne{1550-4859}%
+  \def\@permissionCodeTwo{1550-4867}%
 \or % TQC
   \def\@journalName{ACM Transactions on Quantum Computing}%
   \def\@journalNameShort{ACM Trans. Quantum Comput.}%
   \def\@permissionCodeOne{2643-6817}%
+  \def\@permissionCodeTwo{2643-6817}%
 \or % TRETS
   \def\@journalName{ACM Transactions on Reconfigurable Technology and Systems}%
   \def\@journalNameShort{ACM Trans. Reconfig. Technol. Syst.}%
   \def\@permissionCodeOne{1936-7406}%
+  \def\@permissionCodeTwo{1936-7414}%
 \or % TSAS
   \def\@journalName{ACM Transactions on Spatial Algorithms and Systems}%
   \def\@journalNameShort{ACM Trans. Spatial Algorithms Syst.}%
   \def\@permissionCodeOne{2374-0353}%
+  \def\@permissionCodeTwo{2374-0361}%
 \or % TSC
   \def\@journalName{ACM Transactions on Social Computing}%
   \def\@journalNameShort{ACM Trans. Soc. Comput.}%
   \def\@permissionCodeOne{2469-7818}%
+  \def\@permissionCodeTwo{2469-7826}%
 \or % TSLP
   \def\@journalName{ACM Transactions on Speech and Language Processing}%
   \def\@journalNameShort{ACM Trans. Speech Lang. Process.}%
   \def\@permissionCodeOne{1550-4875}%
+  \def\@permissionCodeTwo{2329-9304}%
 \or % TWEB
   \def\@journalName{ACM Transactions on the Web}%
   \def\@journalNameShort{ACM Trans. Web}%
   \def\@permissionCodeOne{1559-1131}%
+  \def\@permissionCodeTwo{1559-114X}%
 \else % FACMP, a dummy journal
   \def\@journalName{ACM Just Accepted}%
   \def\@journalNameShort{ACM Accepted}%
@@ -1462,12 +1526,13 @@
   \ClassError{\@classname}{Incorrect journal #1}%
 }%
 \def\acmJournal#1{\setkeys{ACM}{acmJournal=#1}%
-  \global\@ACM@journal@bibstriptrue}
+  \global\@ACM@journal@bibstriptrue
+  \global\@ACM@journal@bibstrip@or@togtrue}
 \def\@journalCode@nr{0}
 \def\@journalName{}%
 \def\@journalNameShort{\@journalName}%
 \def\@permissionCodeOne{XXXX-XXXX}%
-\def\@permissionCodeTwo{}%
+\def\@permissionCodeTwo{\@permissionCodeOne}%
 \newcommand\acmConference[4][]{%
   \gdef\acmConference@shortname{#1}%
   \gdef\acmConference@name{#2}%
@@ -1477,6 +1542,11 @@
     \gdef\acmConference@shortname{#2}%
   \fi
   \global\@ACM@journal@bibstripfalse
+  \ifx\@acmBooktitle\@empty\relax
+    \acmBooktitle{Proceedings of \acmConference@name
+      \ifx\acmConference@name\acmConference@shortname\else
+      \ (\acmConference@shortname)\fi}%
+  \fi
 }
 \if@ACM@journal\else
 \acmConference[Conference'17]{ACM Conference}{July 2017}{Washington,
@@ -1484,11 +1554,6 @@
 \fi
 \def\acmBooktitle#1{\gdef\@acmBooktitle{#1}}
 \acmBooktitle{}
-\ifx\acmConference@name\@undefined\else
-\acmBooktitle{Proceedings of \acmConference@name
-       \ifx\acmConference@name\acmConference@shortname\else
-       \ (\acmConference@shortname)\fi}
-\fi
 \def\@editorsAbbrev{(Ed.)}
 \def\@acmEditors{}
 \def\editor#1{\ifx\@acmEditors\@empty
@@ -1568,10 +1633,8 @@
   \def\institution##1{##1\ignorespaces}%
   \def\department{\@ifnextchar[{\@department}{\@department[]}}%
   \def\@department[##1]##2{\unskip, ##2\ignorespaces}%
-  \let\streetaddress\position
   \let\city\position
   \let\state\position
-  \let\postcode\position
   \let\country\position
   Also with #1\unskip.\egroup}
 \renewcommand{\email}[2][]{%
@@ -1642,6 +1705,8 @@
   January\or February\or March\or April\or May\or June\or
   July\or August\or September\or October\or November\or
   December\fi~\@acmYear}
+\def\acmPrice#1{\ClassWarning{\@classname}{The macro \string\acmPrice
+    is obsolete.  ACM no longer prints the price in bibstrip.}}
 \def\acmSubmissionID#1{\def\@acmSubmissionID{#1}}
 \acmSubmissionID{}
 \def\acmISBN#1{\def\@acmISBN{#1}}
@@ -1936,22 +2001,6 @@
   Copyright held by the owner/author(s).
   \fi}
 \def\@formatdoi#1{\url{https://doi.org/#1}}
-\def\@ACM@copyright@check@cc{%
-  \if@ACM@nonacm
-     \ClassInfo{\@classname}{Using CC license with a non-acm
-       material}%
-  \else
-     \if@ACM@engage
-        \ClassInfo{\@classname}{Using CC license with ACM Enage
-          material}%
-      \else
-      \ClassWarning{\@classname}{%
-        Sorry, Creative Commons licenses are\MessageBreak
-        currently not used with ACM publications\MessageBreak
-        typeset by the authors}{Please use nonacm
-           option or ACM Engage class to enable CC licenses}%
-      \fi
-  \fi}
 \def\@copyrightpermission{%
   \ifcase\acm@copyrightmode\relax % none
   \or % acmcopyright
@@ -1977,7 +2026,7 @@
    and\hspace*{.5pt}/or a fee. Request permissions from
    permissions@acm.org.
   \or % rightsretained
-   Permission to make digital or hard copies of part or all of this
+   Permission to make digital or hard copies of all or part of this
    work for personal or classroom use is granted without fee provided
    that copies are not made or distributed for profit or commercial
    advantage and that copies bear this notice and the full citation on
@@ -2080,7 +2129,6 @@
    disseminate the work on their personal and corporate Web sites with
    the appropriate attribution.
  \or % CC
-   \@ACM@copyright@check@cc
    \IfEq{\ACM@cc@type}{zero}{%
      \def\ACM@CC@Url{https://creativecommons.org/publicdomain/zero/1.0/legalcode}}{%
   \edef\ACM@CC@Url{https://creativecommons.org/licenses/\ACM@cc@type/\ACM@cc@version/legalcode}}%
@@ -2158,7 +2206,7 @@
   \if@ACM@acmcp\else
     \ifx\@empty\@authorsaddresses\else
        \if@ACM@anonymous\else
-         \if@ACM@journal@bibstrip
+         \if@ACM@journal@bibstrip@or@tog
            \footnotetextauthorsaddresses{%
              \def\par{\let\par\@par}\parindent\z@\@setauthorsaddresses}%
          \fi
@@ -2215,7 +2263,7 @@
         \else
           \if@ACM@nonacm\else
             \if@ACM@journal@bibstrip
-              ACM~\@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle\\
+              ACM~\@permissionCodeTwo/\@acmYear/\@acmMonth-ART\@acmArticle\\
               \@formatdoi{\@acmDOI}%
             \else % Conference
               \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN\\\fi
@@ -2256,7 +2304,7 @@
     pdfsubject={\@concepts},
     pdfkeywords={\@keywords},
     pdfcreator={LaTeX with acmart
-      \csname ver@acmart.cls\endcsname\space
+      \csname ver@\@classname.cls\endcsname\space
       and hyperref
       \csname ver@hyperref.sty\endcsname}}%
   \andify\authors
@@ -2501,8 +2549,12 @@
     \unskip\cleaders\copy\@ACM@commabox\hskip\wd\@ACM@commabox
   \fi\fi
   #1}
-\def\streetaddress#1{\unskip\ignorespaces}
-\def\postcode#1{\unskip\ignorespaces}
+\def\streetaddress#1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your street
+  address}\unskip\ignorespaces}
+\def\postcode#1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your postal
+  code}\unskip\ignorespaces}
 \if@ACM@journal
   \def\position#1{\unskip\ignorespaces}
   \def\institution#1{\global\@ACM@instpresenttrue
@@ -2762,11 +2814,14 @@
 \def\@mkauthorsaddresses{%
   \ifnum\num@authors>1\relax
   Authors' \else Author's \fi
-  \ifnum\num@authorgroups>1\relax
-  addresses: \else address: \fi
+  Contact Information:
   \bgroup
-  \def\streetaddress##1{\unskip, ##1}%
-  \def\postcode##1{\unskip, ##1}%
+  \def\streetaddress##1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your street
+  address}\unskip\ignorespaces}%
+  \def\postcode##1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your postal
+  code}\unskip\ignorespaces}%
   \def\position##1{\unskip\ignorespaces}%
   \gdef\@ACM@institution@separator{, }%
   \def\institution##1{\unskip\@ACM@institution@separator ##1\gdef\@ACM@institution@separator{ and }}%
@@ -2960,7 +3015,7 @@
       \@acmArticle\if@ACM@printfolios:\thepage\fi%
     \fi%
   }%
-  \if@ACM@journal@bibstrip
+  \if@ACM@journal@bibstrip@or@tog
     \ifcase\ACM@format@nr
     \relax % manuscript
       \fancyhead[LE]{\ACM@linecountL\if@ACM@printfolios\thepage\fi}%
@@ -2996,9 +3051,15 @@
       \fancyhead[RE]{\ACM@linecountR}%
       \fancyhead[RO]{\@headfootfont
         \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM@linecountR}%
-      \if@ACM@nonacm\else%
-        \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
-        \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
+      \if@ACM@nonacm\else
+        \if@ACM@journal@bibstrip
+          \fancyfoot[RO,LE]{\footnotesize \@journalNameShort,
+            Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle.
+            Publication date: \@acmPubDate.}%
+        \else
+          \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname,
+            \acmConference@date, \acmConference@venue.}%
+         \fi
       \fi
     \else % Proceedings
       \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
@@ -3077,7 +3138,7 @@
   \fancyhf{}%
   \renewcommand{\headrulewidth}{\z@}%
   \renewcommand{\footrulewidth}{\z@}%
-  \if@ACM@journal@bibstrip
+  \if@ACM@journal@bibstrip@or@tog
     \ifcase\ACM@format@nr
     \relax % manuscript
       \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
@@ -3108,9 +3169,14 @@
       \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}%
     \or % acmtog
       \if@ACM@nonacm\else%
-        \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
-        \@acmNumber, Article \@acmArticle.  Publication date:
-        \@acmPubDate.}%
+        \if@ACM@journal@bibstrip
+          \fancyfoot[RO,LE]{\footnotesize \@journalNameShort,
+            Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle.
+            Publication date: \@acmPubDate.}%
+        \else
+          \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname,
+            \acmConference@date, \acmConference@venue.}%
+         \fi
       \fi%
       \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
       \fancyhead[R]{\@acmBadgeR\ACM@linecountR}%
@@ -3180,28 +3246,33 @@
  \fi
 }
 \def\ACM@adddotafter#1{\ifx\relax#1\relax\else\LTX@adddotafter{#1}\fi}
-\renewcommand\section{\@startsection{section}{1}{\z@}%
+\renewcommand\section{\def\@toclevel{1}%
+  \@startsection{section}{1}{\z@}%
   {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {.25\baselineskip}%
   {\ACM@NRadjust\@secfont}}
-\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+\renewcommand\subsection{\def\@toclevel{2}%
+  \@startsection{subsection}{2}{\z@}%
   {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {.25\baselineskip}%
   {\ACM@NRadjust\@subsecfont}}
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+\renewcommand\subsubsection{\def\@toclevel{3}%
+  \@startsection{subsubsection}{3}{\z@}%
   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {-3.5\p@}%
   {\ACM@NRadjust{\@subsubsecfont\@adddotafter}}}
-\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
+\renewcommand\paragraph{\def\@toclevel{4}%
+  \@startsection{paragraph}{4}{\parindent}%
   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {-3.5\p@}%
   {\ACM@NRadjust{\@parfont\@adddotafter}}}
-\newcommand\noindentparagraph{\@startsection{paragraph}{4}{\z@}%
+\newcommand\noindentparagraph{\def\@toclevel{4}%
+  \@startsection{paragraph}{4}{\z@}%
   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {-3.5\p@}%
   {\ACM@NRadjust{\@parfont}}}
-
-\renewcommand\part{\@startsection{part}{9}{\z@}%
+\renewcommand\part{\def\@toclevel{9}%
+  \@startsection{part}{9}{\z@}%
   {-10\p@ \@plus -4\p@ \@minus -2\p@}%
   {4\p@}%
   {\ACM@NRadjust\@parfont}}
@@ -3209,7 +3280,7 @@
   \rightskip\@rightskip
   \leftskip\z@skip
   \parindent\z@}
-\def\@secfont{\sffamily\bfseries\section@raggedright\MakeTextUppercase}
+\def\@secfont{\sffamily\bfseries\section@raggedright}
 \def\@subsecfont{\sffamily\bfseries\section@raggedright}
 \def\@subsubsecfont{\sffamily\itshape}
 \def\@parfont{\itshape}
@@ -3218,16 +3289,16 @@
 \relax % manuscript
 \or % acmsmall
 \or % acmlarge
- \def\@secfont{\sffamily\large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\large\section@raggedright}
  \def\@subsecfont{\sffamily\large\section@raggedright}
 \or % acmtog
- \def\@secfont{\sffamily\large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\large\section@raggedright}
  \def\@subsecfont{\sffamily\large\section@raggedright}
 \or % sigconf
- \def\@secfont{\bfseries\Large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\bfseries\Large\section@raggedright}
  \def\@subsecfont{\bfseries\Large\section@raggedright}
 \or % siggraph
- \def\@secfont{\sffamily\bfseries\Large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\bfseries\Large\section@raggedright}
  \def\@subsecfont{\sffamily\bfseries\Large\section@raggedright}
 \or % sigplan
  \def\@secfont{\bfseries\Large\section@raggedright}
@@ -3237,14 +3308,14 @@
  \def\@subparfont{\itshape}
 \or % sigchi
  \setcounter{secnumdepth}{1}
- \def\@secfont{\sffamily\bfseries\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\bfseries\section@raggedright}
  \def\@subsecfont{\sffamily\bfseries\section@raggedright}
 \or % sigchi-a
  \setcounter{secnumdepth}{0}
- \def\@secfont{\sffamily\bfseries\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\bfseries\section@raggedright}
  \def\@subsecfont{\sffamily\bfseries\section@raggedright}
 \or % acmengage
- \def\@secfont{\bfseries\Large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\bfseries\Large\section@raggedright}
  \def\@subsecfont{\bfseries\Large\section@raggedright}
 \or %acmcp
 \fi
diff --git a/acmart.dtx b/acmart.dtx
index 85f5245..26e19fd 100644
--- a/acmart.dtx
+++ b/acmart.dtx
@@ -1,6 +1,6 @@
 % \iffalse
 %
-% Copyright 2016-2023, Association for Computing Machinery
+% Copyright 2016-2024, Association for Computing Machinery
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
 % version 1.3 of this license or (at your option) any
@@ -57,7 +57,7 @@
 % \ifx\currentjob\guide\OnlyDescription\fi
 % \GetFileInfo{acmart.dtx}
 % \title{\LaTeX{} Class for the \emph{Association for Computing
-% Machinery}\thanks{\copyright 2016--2023, Association for Computing Machinery}}
+% Machinery}\thanks{\copyright 2016--2024, Association for Computing Machinery}}
 % \author{Boris Veytsman\thanks{%
 % \href{mailto:borisv@lk.net}{\texttt{borisv@lk.net}},
 % \href{mailto:boris@varphi.com}{\texttt{boris@varphi.com}}}}
@@ -289,10 +289,12 @@
 % transactions, and course materials, while formats starting with
 % |sig| are intended for proceedings published as books.
 %
-% Note that sometimes conference proceedings are published as a
-% special issue (or issues) of an ACM journal.  In this case, you
-% should use the journal format for a conference paper.  Please
-% contact your conference committee if in doubt.
+% Sometimes conference proceedings are published as a special issue
+% (or issues) of an ACM journal.  In this case, you should use the
+% journal format.  The templates |sample-acmsmall-conf.tex| and
+% |sample-acmtog-conf.tex| show how to enter conference information.
+% Note that you need to comment out |\acmJournal{...}| line for such
+% papers to get the conference information in the footers and headers.
 %
 % \begin{table}
 %   \centering
@@ -306,16 +308,16 @@
 %   acmsmall & Small single-column format.  Used for ACMJCSS, CIE, CSUR,
 %            DLT, FAC, GAMES, JACM, JATS,  JDIQ, JDS, JEA, JERIC,
 %            JETC, JRC, PACMCGIT, PACMHCI, PACMMOD, PACMNET,
-%            PACMPL, PACMSE, TAAS, TACCESS, TACO,
+%            PACMPL, PACMSE, POMACS, TAAS, TACCESS, TACO,
 %            TALG, TALLIP (formerly TALIP), TCPS, TDS,
 %            TEAC, TECS, TELO, THRI, TIIS, TIOT, TISSEC, TIST, TKDD, TMIS,
 %            TOCE, TOCHI, TOCL,
 %            TOCS, TOCT, TODAES, TODS, TOIS, TOIT, TOMACS, TOMM (formerly
 %            TOMCCAP), TOMPECS, TOMS, TOPC, TOPLAS, TOPML, TOPS, TORS
 %            TOS, TOSEM, TOSN, TQC, TRETS,
-%            TSAS, TSC, TSLP and TWEB, including special issues. \\
+%            TSAS, TSC, TSLP, and TWEB, including special issues. \\
 %   acmlarge  & Large single-column format.  Used for DTRAP, HEALTH,
-%           IMWUT, JOCCH, POMACS and TAP, including special issues. \\
+%           IMWUT, JOCCH, and TAP, including special issues. \\
 %   acmtog   & Large double-column format.  Used for
 %          TOG, including annual conference Technical Papers.\\
 %   sigconf & Proceedings format for most ACM
@@ -384,11 +386,13 @@
 %
 % The option |balance| determines whether the last page in the two
 % column mode has balanced columns.  By default it is |true|; however,
-% it may lead to problems for some documents.  Set it to |false| if
-% you encounter compilation errors.  Note that for one page documents
-% \cs{balance} command might cause problems.  An alternative is the
+% it may lead to problems for some documents.  When there are many
+% figures near the end of the document, the attempts to balance
+% columns may lead to the loss of the figures.  Set this option to |false| if
+% you encounter problems.   An alternative is the
 % (experimental) option |pbalance|, which uses the new package
-% |pbalance| for this end.
+% |pbalance|.  You may want to try |pbalance=true| to see if you get
+% better results.  
 %
 % The option |urlbreakonhyphens| determines whether URLs can be split
 % between lines after hyphens.  By default it is true.  Set it to
@@ -633,15 +637,12 @@
 % \author{Ben Trovato}
 % \additionalaffiliation{%
 %   \institution{The Th{\o}rv{\"a}ld Group}
-%   \streetaddress{1 Th{\o}rv{\"a}ld Circle}
 %   \city{Hekla}
 %   \country{Iceland}}
 % \affiliation{%
 %   \institution{Institute for Clarity in Documentation}
-%   \streetaddress{P.O. Box 1212}
 %   \city{Dublin}
-%   \state{Ohio}
-%   \postcode{43017-6221}}
+%   \state{Ohio}}
 % \end{verbatim}
 % Here Trovato and Tobin share their affiliation with the Institute
 % for Clarity in Documentation, but only Ben Trovato is affiliated
@@ -651,16 +652,14 @@
 % \DescribeMacro{\position}%
 % \DescribeMacro{\institution}%
 % \DescribeMacro{\department}%
-% \DescribeMacro{\streetaddress}%
 % \DescribeMacro{\city}%
 % \DescribeMacro{\state}%
-% \DescribeMacro{\postcode}%
 % \DescribeMacro{\country}%
 % The \cs{affiliation} and \cs{additionalaffiliation} commands are
 % further structured to interact with the metadata extraction tools.
 % Inside these commands you should use the \cs{position},
-% \cs{institution}, \cs{department}, \cs{city}, \cs{streetaddress},
-% \cs{state}, \cs{postcode} and \cs{country} macros to indicate the
+% \cs{institution}, \cs{department}, \cs{city}, 
+% \cs{state}, and \cs{country} macros to indicate the
 % corresponding parts of the affiliation.  Note that in some cases
 % (for example, journals) these parts are not printed in the resulting
 % copy, but they \emph{are} necessary since they are used by the XML
@@ -673,6 +672,11 @@
 % issued. Currently the absence of \cs{country} produces an error;
 % ACM may change this in the future.
 %
+% Starting 2024, ACM no longer collects or print postal addresses of
+% the authors.  Thus the commands \cs{streetaddress} and
+% \cs{postcode}, present in the previous versions of the class, now
+% produce a warining.
+%
 %
 % An example of the author block:
 % \begin{verbatim}
@@ -681,10 +685,8 @@
 % \affiliation{%
 %   \institution{University of New South Wales}
 %   \department{School of Biomedical Engineering}
-%   \streetaddress{Samuels Building (F25), Kensington Campus}
 %   \city{Sidney}
 %   \state{NSW}
-%   \postcode{2052}
 %   \country{Australia}}
 % \email{author@nsw.au.edu}
 % \author{A. N. Other}
@@ -735,51 +737,6 @@
 % \end{verbatim}
 %
 %
-% The command \cs{affiliation} formats its output according to
-% American conventions.  This might be wrong for some cases.
-% Consider, for example, a German address.  In Germany, the postcode is
-% put before the city and is not separated by a comma.  We can handle this
-% order using
-% \begin{verbatim}
-% \affiliation{%
-%   \institution{Fluginstitut}
-%   \streetaddress{Sonnenallee 17}
-%   \postcode{123456}
-%   \city{Helm}
-%   \country{Germany}}
-% \end{verbatim}
-% However, the comma after the postcode is unfortunate:  the address will
-% be typeset (in some formats) as
-% \begin{verbatim}
-% Fluginstitut
-% Sonenallee 17
-% 123456, Helm, Germany
-% \end{verbatim}
-%
-%
-% To overcome this problem, the command \cs{affiliation} has an
-% optional parameter |obeypunctuation|, which can be |false| (the
-% default) or |true|.  If this parameter is |true|, \cs{afffiliation}
-% obeys the author's command.  Thus
-% \begin{verbatim}
-% \affiliation[obeypunctuation=true]{%
-%   \institution{Fluginstitut}\\
-%   \streetaddress{Sonnenallee 17}\\
-%   \postcode{123456}
-%   \city{Helm},
-%   \country{Germany}}
-% \end{verbatim}
-% will be typeset as
-% \begin{verbatim}
-% Fluginstitut
-% Sonenallee 17
-% 123456 Helm, Germany
-% \end{verbatim}
-%
-% Note that you should \emph{not} use this option for journals.
-%
-% It is expected that these commands are inserted by the author of the
-% manuscript.
 %
 % \DescribeMacro{\thanks}%
 % Like |amsart| (and unlike standard \LaTeX{}), we allow
@@ -867,14 +824,12 @@
 %
 % \DescribeMacro{\acmArticleSeq}%
 % The articles in the same issue of a journal have a \emph{sequence
-% number}.  It is used to vertically position the black blob on the first
-% page of some formats.  By default it is the same as the article number,
+% number}.  By default it is the same as the article number,
 % but the command \cs{acmArticleSeq}\marg{n} can be used to change it:
 % \begin{verbatim}
 % \acmArticle{39}   % The sequence number will be 39 by default
 % \acmArticleSeq{5} % We redefine it to 5
 % \end{verbatim}
-% Setting this number to zero suppresses the blob.
 %
 % \DescribeMacro{\acmSubmissionID}%
 % If your paper got a Submission~ID from the Conference Management
@@ -884,18 +839,6 @@
 % \end{verbatim}
 %
 %
-% \DescribeMacro{\acmPrice}%
-% The macro \cs{acmPrice}\marg{price} sets the price for the article,
-% for example,
-% \begin{verbatim}
-% \acmPrice{25.00}
-% \end{verbatim}
-% Note that you do not need to put the dollar sign here, just the
-% amount.  By default the price is \$15.00, unless the copyright is
-% set to |usgov|, |rightsretained|, |iw3c2w3|, or |iw3c2w3g|, when it
-% is suppressed.  Note that to override the defaults you need to set
-% the price \emph{after} the \cs{setcopyright} command.  Also, the
-% command |\acmPrice{}| suppresses the printing of the price.
 %
 % \DescribeMacro{\acmISBN}%
 % Book-like volumes have ISBN numbers attached to them.  The macro
@@ -1004,8 +947,8 @@
 %
 % \DescribeMacro{\setcopyright}
 % There are several possibilities for the copyright of the papers
-% published by the ACM: the authors may transfer the rights to the ACM,
-% license them to the ACM, some or all authors might be employees of the
+% published by the ACM: the authors may license the paper 
+% to the ACM, some or all authors might be employees of the
 % US or Canadian governments, etc.  Accordingly the command
 % \verb|\setcopyright{...}| is introduced.  Its argument is the
 % copyright status of the paper, for example,
@@ -1025,8 +968,6 @@
 %     \midrule
 %     \texttt{none} & The copyright and permission information is not
 %     typeset.  (This is the option for some ACM conferences.) \\
-%     \texttt{acmcopyright} & The authors transfer the copyright to the
-%     ACM (the ``traditional'' choice).\\
 %     \texttt{acmlicensed} & The authors retain the copyright but
 %     license the publication rights to ACM\@. \\
 %     \texttt{rightsretained} & The authors retain the copyright and
@@ -1057,9 +998,10 @@
 %     by IW3C2, when some authors are approved Google employees.\\
 %     \texttt{cc} & Creative Commons license.  If this key is set,
 %     \textsl{doclicense} images are used to typeset the license. See
-%     also \cs{setcctype} command.  Note that at present this license
-%     can be used only for \texttt{acmengage} format or for
-%     \texttt{nonacm} publications.\\
+%     also \cs{setcctype} command.  \\
+%     \texttt{acmcopyright} & The authors transfer the copyright to the
+%     ACM.  This choice is no longer available for the
+%     non-commissioned authors and will trigger a warning.\\
 %     \bottomrule
 %   \end{tabularx}
 % \end{table}
@@ -2103,10 +2045,7 @@
 %
 % \DescribeMacro{\AtBeginMaketitle}%
 % Another hook is \cs{AtBeginMaketitle}.  The commands in this hook
-% are executed before \cs{maketitle}, for example,
-% \begin{verbatim}
-% \AtBeginMaketitle{\acmPrice{125.00}}
-% \end{verbatim}
+% are executed before \cs{maketitle}.
 %
 %
 %\subsection{Currently supported publications}
@@ -2168,7 +2107,7 @@
 %     TDS & ACM/IMS Transactions on Data Science\\
 %     TEAC & ACM Transactions on Economics and Computation\\
 %     TECS & ACM Transactions on Embedded Computing Systems \\
-%     TELO & ACM Transactions on Evolutionary Learning \\
+%     TELO & ACM Transactions on Evolutionary Learning and Optimization\\
 %     THRI & ACM Transactions on Human-Robot Interaction\\
 %     TIIS & ACM Transactions on Interactive Intelligent Systems\\
 %     TIOT & ACM Transactions on Internet of Things \\
@@ -2214,6 +2153,47 @@
 % reserved for new journals which are not assigned an ISSN yet.
 %
 %
+%\subsection{Samples}
+%\label{sec:samples}
+%
+% There are several samples of acmart documents, that can serve as
+% templates for the authors.  Among them
+% |sample-sig...| are templates for conference papers, while
+% |sample-acm...| are templates for journal articles and special
+% materials.
+%
+% Here is the list of the samples:
+% \begin{description}
+% \item[sample-manuscript:] A proceedings paper in the manuscript format.
+% \item[sample-acmsmall:] A journal paper in the |acmsmall| format.
+% \item[sample-acmsmall-biblatex:] A journal paper using experimental
+% \textsl{biblatex} bibliography processing.
+% \item[sample-acmlarge:] A journal paper in the |acmlarge| format.
+% \item[sample-acmtog:] A journal paper in the |acmtog| format.
+% \item[sample-sigconf:] A proceedings paper in the standard |sigconf|
+% format.
+% \item[sample-sigconf-biblatex:] A proceedings paper in the |sigconf|
+% format using experimental \textsl{biblatex} bibliography
+% processing.
+% \item[sample-sigconf-authordraft:] A proceedings paper in the
+% |sigconf| format with the |authordraft| option selected.
+% \item[sample-sigconf-i13n:] A proceedings paper in the
+% |sigconf| format with multilanguage titles and abstract.
+% \item[sample-sigconf-xelatex:] A proceedings paper in the
+% |sigconf| format, Xe\LaTeX\ version.
+% \item[sample-sigconf-lualatex:] A proceedings paper in the
+% |sigconf| format, Lua\LaTeX\ version.
+% \item[sample-sigplan:] A proceedings paper in the |sigplan| format.
+% \item[sample-acmsmall-conf:] A proceedings paper in the |acmsmall|
+% format for the publication in a journal using this option.
+% \item[sample-acmtog-conf:] A proceedings paper in the |acmtog|
+% format for the publication in a journal using this option.
+% \item[sample-acmcp:] A sample of ACM Cover Page used by JDS.
+% \item[sample-acmengage:] A sample of ACM Engage publication.
+% \end{description}
+%
+%
+%
 %\subsection{A note about \texttt{sigchi-a} format}
 %\label{sec:sigchi-a}
 %
@@ -2253,6 +2233,24 @@
 % \item |figure*|: \cs{fulltextwidth}.
 % \end{enumerate}
 %
+%\subsection{Experiments with tagging}
+%\label{sec:ug_tagged}
+%
+% ACM is firmly committed to produce fully tagged PDFs compliant with
+% the accessibility standards.  We use the developmental version of
+% tagging code by \LaTeX3 team, see the details at
+% \url{https://www.latex-project.org/publications/indexbytopic/pdf/}
+% and \url{https://tug.org/twg/accessibility/overview.html}.
+%
+% At present this work is highly experimental.  You may try the
+% experiments by (1)~using the class |acmart-tagged| in the document
+% class line, and (2)~adding the command
+% \cs{DocumentMetadata}\oarg{options} in the preamble, see the file
+% \path{sample-acmsmall-tagged.tex}.  If you do this, please \emph{do
+% not ask ACM for support}.  On the other hand, bug reports at
+% \url{https://github.com/borisveytsman/acmart/issues} will be
+% appreciated.  
+% 
 %
 %
 % \StopEventually{
@@ -2277,8 +2275,9 @@
 %<*gobble>
 \ProvidesFile{acmart.dtx}
 %</gobble>
-%<class>\ProvidesClass{acmart}
-[2023/10/22 v1.93 Typesetting articles for the Association for Computing Machinery]
+%<class&!tagged>\ProvidesClass{acmart}
+%<tagged>\ProvidesClass{acmart-tagged}
+[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery]
 %    \end{macrocode}
 %
 % \changes{v1.00}{2016/04/14}{First released version}
@@ -2393,6 +2392,8 @@
 % \changes{1.92}{2023/09/30}{Documentation update: use of `anonymous'
 % throughout} 
 % \changes{v1.93}{2023/10/22}{Added PACMSE journal option}
+% \changes{v2.01}{2024/01/06}{Documentation update: POMACS uses acmsmall}
+% \changes{v2.03}{2024/02/04}{Added documentation about samples}
 % 
 % And the driver code:
 %    \begin{macrocode}
@@ -2413,7 +2414,8 @@
 \end{document}
 %</gobble>
 %<*class>
-\def\@classname{acmart}
+%<!tagged>\def\@classname{acmart}
+%<tagged>\def\@classname{acmart-tagged}
 %    \end{macrocode}
 %
 %
@@ -2454,13 +2456,13 @@
 % \changes{1.87}{2022/08/13}{New format: acmcp}
 %   The possible formats
 %    \begin{macrocode}
-\define@choicekey*+{acmart.cls}{format}[\ACM@format\ACM@format@nr]{%
+\define@choicekey*+{\@classname.cls}{format}[\ACM@format\ACM@format@nr]{%
   manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph,
   sigplan, sigchi, sigchi-a, acmengage, acmcp}[manuscript]{}{%
   \ClassError{\@classname}{The option format must be manuscript,
     acmsmall, acmlarge, acmtog, sigconf, siggraph,
     sigplan, sigchi or sigchi-a}}
-\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{acmart.cls}{format=#1}}}
+\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{\@classname.cls}{format=#1}}}
 \@DeclareACMFormat{manuscript}
 \@DeclareACMFormat{acmsmall}
 \@DeclareACMFormat{acmlarge}
@@ -2480,7 +2482,7 @@
 % \begin{macro}{\if@ACM@screen}
 %   Whether we use screen mode
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{screen}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{screen}[true]{%
   \if@ACM@screen
     \PackageInfo{\@classname}{Using screen mode}%
   \else
@@ -2495,7 +2497,7 @@
 % \begin{macro}{\if@ACM@urlbreakonhyphens}
 % \changes{1.60}{2019/04/22}{introduced macro}
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{urlbreakonhyphens}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{urlbreakonhyphens}[true]{%
   \if@ACM@urlbreakonhyphens
     \PackageInfo{\@classname}{Using breaking urls on hyphens}%
   \else
@@ -2511,7 +2513,7 @@
 % \changes{v1.46}{2017/08/29}{Modified description}
 %   Whether we define theorem-like environments.
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{acmthm}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{acmthm}[true]{%
   \if@ACM@acmthm
     \PackageInfo{\@classname}{Requiring acmthm}%
   \else
@@ -2528,7 +2530,7 @@
 % \changes{v1.48}{2017/09/09}{Review mode now switches on folios}
 %   Whether we use review mode
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{review}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{review}[true]{%
   \if@ACM@review
     \PackageInfo{\@classname}{Using review mode}%
     \AtBeginDocument{\@ACM@printfoliostrue}%
@@ -2545,7 +2547,7 @@
 % \changes{v1.03}{2016/04/22}{Added macro}
 %   Whether we use author's-version mode
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{authorversion}[true]{%
   \if@ACM@authorversion
     \PackageInfo{\@classname}{Using authorversion mode}%
   \else
@@ -2562,7 +2564,7 @@
 %   Special option for non-ACM publications
 %   using the ACM typesetting options.
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{nonacm}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{nonacm}[true]{%
   \if@ACM@nonacm
     \PackageInfo{\@classname}{Using nonacm mode}%
     \AtBeginDocument{\@ACM@printacmreffalse}%
@@ -2582,7 +2584,7 @@
 % \changes{v1.57}{2018/12/16}{Added macro}
 % Whether to balance the last page
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{balance}[true]{}{%
+\define@boolkey+{\@classname.cls}[@ACM@]{balance}[true]{}{%
   \PackageError{\@classname}{The option balance can be either true or
     false}}
 \ExecuteOptionsX{balance}
@@ -2595,7 +2597,7 @@
 % \changes{v1.76}{2021/03/16}{Added macro}
 % Whether to balance the last page
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{pbalance}[true]{}{%
+\define@boolkey+{\@classname.cls}[@ACM@]{pbalance}[true]{}{%
   \PackageError{\@classname}{The option pbalance can be either true or
     false}}
 \ExecuteOptionsX{pbalance=false}
@@ -2613,7 +2615,7 @@
 % \begin{macro}{\if@ACM@natbib}
 %   Whether we use |natbib| mode
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{natbib}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{natbib}[true]{%
   \if@ACM@natbib
     \PackageInfo{\@classname}{Explicitly selecting natbib mode}%
   \else
@@ -2629,7 +2631,7 @@
 % \begin{macro}{\if@ACM@anonymous}
 %   Whether we use anonymous mode
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{anonymous}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{anonymous}[true]{%
   \if@ACM@anonymous
     \PackageInfo{\@classname}{Using anonymous mode}%
   \else
@@ -2646,7 +2648,7 @@
 % \changes{v1.33}{2017/03/10}{Added macro (Michael D.~Adams)}
 %   Whether we use timestamp mode
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{timestamp}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{timestamp}[true]{%
   \if@ACM@timestamp
     \PackageInfo{\@classname}{Using timestamp mode}%
   \else
@@ -2664,7 +2666,7 @@
 % \changes{v1.36}{2017/05/13}{Corrected typo, thanks to bargteil}
 %   Whether we use author-draft mode
 %    \begin{macrocode}
-\define@boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{%
+\define@boolkey+{\@classname.cls}[@ACM@]{authordraft}[true]{%
   \if@ACM@authordraft
     \PackageInfo{\@classname}{Using authordraft mode}%
     \@ACM@timestamptrue
@@ -2752,6 +2754,17 @@
 %
 % \end{macro}
 %
+% \begin{macro}{\if@ACM@journal@bibstrip@or@tog}
+% \changes{v2.03}{2024/02/04}{Introduced macro}
+% ACM TOG sometimes uses journal-like bibstrip even for conference
+% proceedings, so we need to set it separately
+%    \begin{macrocode}
+\newif\if@ACM@journal@bibstrip@or@tog
+%    \end{macrocode}
+%
+% \end{macro}
+%
+% 
 % \begin{macro}{\if@ACM@sigchiamode}
 %   The formatting of SIGCHI extended abstracts is quite unusual.  We have a
 %   special switch for them.
@@ -2781,7 +2794,6 @@
 % 
 % \end{macro}
 %
-%
 % 
 %
 % Setting up switches
@@ -2790,13 +2802,13 @@
 \ClassWarning{\@classname}{%
   The format siggraph is now obsolete.\MessageBreak
   I am switching to sigconf.}
-  \setkeys{acmart.cls}{format=sigconf}
+  \setkeys{\@classname.cls}{format=sigconf}
 \fi
 \ifnum\ACM@format@nr=7\relax % sigchi
 \ClassWarning{\@classname}{%
   The format sigchi is now obsolete.\MessageBreak
   I am switching to sigconf.}
-  \setkeys{acmart.cls}{format=sigconf}
+  \setkeys{\@classname.cls}{format=sigconf}
 \fi
 \ifnum\ACM@format@nr=8\relax % sigchi
 \ClassWarning{\@classname}{%
@@ -2826,6 +2838,7 @@
   \@ACM@journaltrue
 \or % acmtog
   \@ACM@journaltrue
+  \@ACM@journal@bibstrip@or@togtrue
 \or % sigconf
   \@ACM@journalfalse
 \or % siggraph
@@ -2846,7 +2859,8 @@
   \AtBeginDocument{\@ACM@printacmreffalse}%
 \fi
 \if@ACM@journal
- \@ACM@journal@bibstriptrue
+  \@ACM@journal@bibstriptrue
+  \@ACM@journal@bibstrip@or@togtrue
 \else
  \@ACM@journal@bibstripfalse
 \fi
@@ -2861,6 +2875,42 @@
 % \changes{v1.38}{2017/05/13}{Increase default font size for SIGPLAN}
 % \changes{v1.87}{2022/08/27}{Set font sizes for |acmengage| and |acmcp|}
 %
+%<*tagged>
+% \changes{v2.09}{2022/08/25}{Saved the old definitions (Ulrike's
+% code}
+% Before we load the base class we want to save the original
+% definitions of sectioning commands since |acmart| redefines them,
+% and we need the vanilla versions.
+% \begin{macro}{\@startsection@kernel}
+% \changes{v2.00}{2023/11/19}{Added macro}
+%    \begin{macrocode}
+\let\@startsection@kernel\@startsection
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@xsect@kernel}
+% \changes{v2.00}{2023/11/19}{Added macro}
+%    \begin{macrocode}
+\let\@xsect@kernel\@xsect
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@sect@kernel}
+% \changes{v2.00}{2023/11/19}{Added macro}
+%    \begin{macrocode}
+\let\@sect@kernel\@sect
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@ssect@kernel}
+% \changes{v2.00}{2023/11/19}{Added macro}
+%    \begin{macrocode}
+\let\@ssect@kernel\@ssect
+%    \end{macrocode}
+% \end{macro}
+% 
+%</tagged>
+%
 %
 % At this point we either have \cs{ACM@fontsize} or use defaults
 %    \begin{macrocode}
@@ -3258,6 +3308,14 @@
 % We need to do this early since we want |hyperref| to have a chance
 % to redefine them again:
 %    \begin{macrocode}
+%</class>
+%<*tagged>
+\let\@startsection\@startsection@kernel
+\let\@sect\@sect@kernel
+\let\@ssect\@ssect@kernel
+\let\@xsect\@xsect@kernel
+%</tagged>
+%<*class&!tagged>
 \def\@startsection#1#2#3#4#5#6{%
   \if@noskipsec \leavevmode \fi
   \par
@@ -3337,7 +3395,6 @@
       \fi}%
   \fi
   \ignorespaces}
-\def\@seccntformat#1{\csname the#1\endcsname\quad}
 \def\@ssect#1#2#3#4#5{%
   \@tempskipa #3\relax
   \ifdim \@tempskipa>\z@
@@ -3350,11 +3407,14 @@
     \def\@svsechd{#4{\hskip #1\relax #5}}%
   \fi
   \@xsect{#3}}
+%</class&!tagged>
+%<*class>
+\def\@seccntformat#1{\csname the#1\endcsname\quad}
 %    \end{macrocode}
 %
 % \end{macro}
 %
-% \begin{macro}{\@startsection}
+% \begin{macro}{\@starttoc}
 % \changes{v1.31}{2017/03/04}{Redefined macro}
 % \changes{v1.43}{2017/07/09}{Added \cs{makeatletter}}
 %   The |amsart| package redefines \cs{startsection}.  Here we redefine
@@ -3365,7 +3425,9 @@
   \par\removelastskip\vskip\z@skip
   \@startsection{section}\@M\z@{\linespacing\@plus\linespacing}%
     {.5\linespacing}{\centering\contentsnamefont}{#2}%
+%<tagged>\@starttoc@cfgpoint@before{#1}%NEW<<<<<<<<<< (name will change)
   \@input{\jobname.#1}%
+%<tagged>\@starttoc@cfgpoint@after{#1}%NEW<<<<<<<<<<<<  (name will change)
   \if@filesw
     \@xp\newwrite\csname tf@#1\endcsname
     \immediate\@xp\openout\csname tf@#1\endcsname \jobname.#1\relax
@@ -3481,6 +3543,10 @@
 % \changes{v1.76}{2021/02/21}{Moved hyperxmp before hyperref, see
 % \url{https://github.com/borisveytsman/acmart/issues/425}}
 % \changes{1.92}{2023/10/14}{Moved hyperxmp again due to kernel update}
+% \changes{2.04}{2024/03/17}{Explicitly load ifdraft since hyperxmp
+% tries to load it inside a group}
+% \changes{2.04}{2024/03/31}{Deleted loading ifdraft due to the new
+% release of hyperxmp}
 %    \begin{macrocode}
 \let\@footnotemark@nolink\@footnotemark
 \let\@footnotetext@nolink\@footnotetext
@@ -4342,6 +4408,9 @@
 % \changes{1.89}{2023/03/25}{Added PACMMOD}
 % \changes{1.89}{2023/03/25}{Added TOPML}
 % \changes{1.90}{2023/03/30}{Added TOPML eISSN}
+% \changes{2.05}{2024/04/04}{New data for TELO}
+% \changes{2.06}{2024/04/13}{Added eISSN for a number of journals}
+% \changes{2.07}{2024/04/17}{Another change for TELO}
 %
 % We use the |xkeyval| interface to define journal titles and the relevant
 % information
@@ -4406,9 +4475,9 @@
   TOMPECS,%
   TOMS,%
   TOPC,%
-  TOPS,%
   TOPLAS,%
   TOPML,%
+  TOPS,%
   TORS,%
   TOS,%
   TOSEM,%
@@ -4426,6 +4495,7 @@
   \def\@journalName{ACM Journal on Computing and Sustainable Societies}%
   \def\@journalNameShort{ACM J. Comput. Sustain. Soc.}%
   \def\@permissionCodeOne{2834-5533}%
+  \def\@permissionCodeTwo{2834-5533}%
 \or % CIE
   \def\@journalName{ACM Computers in Entertainment}%
   \def\@journalNameShort{ACM Comput. Entertain.}%
@@ -4434,18 +4504,22 @@
   \def\@journalName{ACM Computing Surveys}%
   \def\@journalNameShort{ACM Comput. Surv.}%
   \def\@permissionCodeOne{0360-0300}%
+  \def\@permissionCodeTwo{1557-7341}%
 \or % DGOV
   \def\@journalName{Digital Government: Research and Practice}%
   \def\@journalNameShort{Digit. Gov. Res. Pract.}%
   \def\@permissionCodeOne{2639-0175}%
+  \def\@permissionCodeTwo{2639-0175}%
 \or % DLT
   \def\@journalName{Distributed Ledger Technologies: Research and Practice}%
   \def\@journalNameShort{Distrib. Ledger Technol.}%
   \def\@permissionCodeOne{2769-6472}%
+  \def\@permissionCodeTwo{2769-6480}%
 \or % DTRAP
   \def\@journalName{Digital Threats: Research and Practice}%
   \def\@journalNameShort{Digit. Threat. Res. Pract.}%
   \def\@permissionCodeOne{2576-5337}%
+  \def\@permissionCodeTwo{2576-5337}%
 \or % FAC
   \def\@journalName{Formal Aspects of Computing}%
   \def\@journalNameShort{Form. Asp. Comput.}%
@@ -4455,31 +4529,37 @@
   \def\@journalName{ACM Games: Research and Practice}%
   \def\@journalNameShort{ACM Games}%
   \def\@permissionCodeOne{2832-5516}%
+  \def\@permissionCodeTwo{2832-5516}%
 \or % HEALTH
   \def\@journalName{ACM Transactions on Computing for Healthcare}%
   \def\@journalNameShort{ACM Trans. Comput. Healthcare}%
   \def\@permissionCodeOne{2637-8051}%
+  \def\@permissionCodeTwo{2637-8051}%
 \or % IMWUT
   \def\@journalName{Proceedings of the ACM on Interactive, Mobile,
     Wearable and Ubiquitous Technologies}%
   \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}%
   \def\@permissionCodeOne{2474-9567}%
+  \def\@permissionCodeTwo{2474-9567}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % JACM
   \def\@journalName{Journal of the ACM}%
   \def\@journalNameShort{J. ACM}%
   \def\@permissionCodeOne{0004-5411}%
+  \def\@permissionCodeTwo{1557-735X}%
 \or % JATS
   \def\@journalName{Journal on Autonomous Transportation Systems}%
   \def\@journalNameShort{ACM J. Auton. Transport. Syst.}%
   \def\@permissionCodeOne{2833-0528}%
+  \def\@permissionCodeTwo{2833-0528}%
 \or % JDIQ
   \def\@journalName{ACM Journal of Data and Information Quality}%
   \def\@journalNameShort{ACM J. Data Inform. Quality}%
   \def\@permissionCodeOne{1936-1955}%
+  \def\@permissionCodeTwo{1936-1963}%
 \or % JDS
-  \def\@journalName{ACM/JMS Journal of Data Science}%
+  \def\@journalName{ACM/IMS Journal of Data Science}%
   \def\@journalNameShort{ACM/IMS J. Data Sci.}%
   \def\@permissionCodeOne{2831-3194}%
   \def\@permissionCodeTwo{2831-3194}%
@@ -4487,6 +4567,7 @@
   \def\@journalName{ACM Journal of Experimental Algorithmics}%
   \def\@journalNameShort{ACM J. Exp. Algor.}%
   \def\@permissionCodeOne{1084-6654}%
+  \def\@permissionCodeTwo{1084-6654}%
 \or % JERIC
   \def\@journalName{ACM Journal of Educational Resources in Computing}%
   \def\@journalNameShort{ACM J. Edu. Resources in Comput.}%
@@ -4495,6 +4576,7 @@
   \def\@journalName{ACM Journal on Emerging Technologies in Computing Systems}%
   \def\@journalNameShort{ACM J. Emerg. Technol. Comput. Syst.}%
   \def\@permissionCodeOne{1550-4832}%
+  \def\@permissionCodeTwo{1550-4840}%
 \or % JOCCH
   \def\@journalName{ACM Journal on Computing and Cultural Heritage}%
   \def\@journalNameShort{ACM J. Comput. Cult. Herit.}%
@@ -4504,52 +4586,62 @@
   \def\@journalName{ACM Journal on Responsible Computing}%
   \def\@journalNameShort{ACM J. Responsib. Comput.}%
   \def\@permissionCodeOne{2832-0565}%
+  \def\@permissionCodeTwo{2832-0565}%
 \or % PACMCGIT
   \def\@journalName{Proceedings of the ACM on Computer Graphics and Interactive Techniques}%
   \def\@journalNameShort{Proc. ACM Comput. Graph. Interact. Tech.}%
   \def\@permissionCodeOne{2577-6193}%
+  \def\@permissionCodeTwo{2577-6193}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMHCI
   \def\@journalName{Proceedings of the ACM on Human-Computer Interaction}%
   \def\@journalNameShort{Proc. ACM Hum.-Comput. Interact.}%
   \def\@permissionCodeOne{2573-0142}%
+  \def\@permissionCodeTwo{2573-0142}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMMOD
   \def\@journalName{Proceedings of the ACM on Management of Data}%
   \def\@journalNameShort{Proc. ACM Manag. Data}%
   \def\@permissionCodeOne{2836-6573}%
+  \def\@permissionCodeTwo{2836-6573}%
 \or % PACMNET
   \def\@journalName{Proceedings of the ACM on Networkng}%
   \def\@journalNameShort{Proc. ACM Netw.}%
   \def\@permissionCodeOne{2834-5509}%
+  \def\@permissionCodeTwo{2834-5509}%
 \or % PACMPL
   \def\@journalName{Proceedings of the ACM on Programming Languages}%
   \def\@journalNameShort{Proc. ACM Program. Lang.}%
   \def\@permissionCodeOne{2475-1421}%
+  \def\@permissionCodeTwo{2475-1421}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % PACMSE
   \def\@journalName{Proceedings of the ACM on Software Engineering}%
   \def\@journalNameShort{Proc. ACM Softw. Eng.}%
   \def\@permissionCodeOne{2994-970X}%
+  \def\@permissionCodeTwo{2994-970X}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % POMACS
   \def\@journalName{Proceedings of the ACM on Measurement and Analysis of Computing Systems}%
   \def\@journalNameShort{Proc. ACM Meas. Anal. Comput. Syst.}%
   \def\@permissionCodeOne{2476-1249}%
+  \def\@permissionCodeTwo{2476-1249}%
   \@ACM@screentrue
   \PackageInfo{\@classname}{Using screen mode due to \@journalCode}%
 \or % TAAS
   \def\@journalName{ACM Transactions on Autonomous and Adaptive Systems}%
   \def\@journalNameShort{ACM Trans. Autonom. Adapt. Syst.}%
   \def\@permissionCodeOne{1556-4665}%
+  \def\@permissionCodeTwo{1556-4703}%
 \or % TACCESS
   \def\@journalName{ACM Transactions on Accessible Computing}%
   \def\@journalNameShort{ACM Trans. Access. Comput.}%
   \def\@permissionCodeOne{1936-7228}%
+  \def\@permissionCodeTwo{1936-7236}%
 \or % TACO
   \def\@journalName{ACM Transactions on Architecture and Code Optimization}%
   \def\@journalNameShort{ACM Trans. Arch. Code Optim.}%
@@ -4559,18 +4651,22 @@
   \def\@journalName{ACM Transactions on Algorithms}%
   \def\@journalNameShort{ACM Trans. Algor.}%
   \def\@permissionCodeOne{1549-6325}%
+  \def\@permissionCodeTwo{1549-6333}%
 \or % TALLIP
   \def\@journalName{ACM Transactions on Asian and Low-Resource Language Information Processing}%
   \def\@journalNameShort{ACM Trans. Asian Low-Resour. Lang. Inf. Process.}%
   \def\@permissionCodeOne{2375-4699}%
+  \def\@permissionCodeTwo{2375-4702}%
 \or % TAP
   \def\@journalName{ACM Transactions on Applied Perception}%
   \def\@journalNameShort{ACM Trans. Appl. Percept.}%
   \def\@permissionCodeOne{1544-3558}%
+  \def\@permissionCodeTwo{1544-3965}%
 \or % TCPS
   \def\@journalName{ACM Transactions on Cyber-Physical Systems}%
   \def\@journalNameShort{ACM Trans. Cyber-Phys. Syst.}%
   \def\@permissionCodeOne{2378-962X}%
+  \def\@permissionCodeTwo{2378-9638}%
 \or % TDS
   \def\@journalName{ACM/IMS Transactions on Data Science}%
   \def\@journalNameShort{ACM/IMS Trans. Data Sci.}%
@@ -4579,26 +4675,32 @@
   \def\@journalName{ACM Transactions on Economics and Computation}%
   \def\@journalNameShort{ACM Trans. Econ. Comput.}%
   \def\@permissionCodeOne{2167-8375}%
+  \def\@permissionCodeTwo{2167-8383}%
 \or % TECS
   \def\@journalName{ACM Transactions on Embedded Computing Systems}%
   \def\@journalNameShort{ACM Trans. Embedd. Comput. Syst.}%
   \def\@permissionCodeOne{1539-9087}%
+  \def\@permissionCodeTwo{1558-3465}%
 \or % TELO
-  \def\@journalName{ACM Transactions on Evolutionary Learning}%
-  \def\@journalNameShort{ACM Trans. Evol. Learn.}%
-  \def\@permissionCodeOne{2688-3007}%
+  \def\@journalName{ACM Transactions on Evolutionary Learning and Optimization}%
+  \def\@journalNameShort{ACM Trans. Evol. Learn. Optim.}%
+  \def\@permissionCodeOne{2688-299X}%
+  \def\@permissionCodeTwo{2688-3007}%
 \or % THRI
   \def\@journalName{ACM Transactions on Human-Robot Interaction}%
   \def\@journalNameShort{ACM Trans. Hum.-Robot Interact.}%
   \def\@permissionCodeOne{2573-9522}%
+  \def\@permissionCodeTwo{2573-9522}%
 \or % TIIS
   \def\@journalName{ACM Transactions on Interactive Intelligent Systems}%
   \def\@journalNameShort{ACM Trans. Interact. Intell. Syst.}%
   \def\@permissionCodeOne{2160-6455}%
+  \def\@permissionCodeTwo{2160-6463}%
 \or % TIOT
   \def\@journalName{ACM Transactions on Internet of Things}%
   \def\@journalNameShort{ACM Trans. Internet Things}%
   \def\@permissionCodeOne{2577-6207}%
+  \def\@permissionCodeTwo{2577-6207}%
 \or % TISSEC
   \def\@journalName{ACM Transactions on Information and System Security}%
   \def\@journalNameShort{ACM Trans. Info. Syst. Sec.}%
@@ -4607,54 +4709,67 @@
   \def\@journalName{ACM Transactions on Intelligent Systems and Technology}%
   \def\@journalNameShort{ACM Trans. Intell. Syst. Technol.}%
   \def\@permissionCodeOne{2157-6904}%
+  \def\@permissionCodeTwo{2157-6912}%
 \or % TKDD
   \def\@journalName{ACM Transactions on Knowledge Discovery from Data}%
   \def\@journalNameShort{ACM Trans. Knowl. Discov. Data.}%
   \def\@permissionCodeOne{1556-4681}%
+  \def\@permissionCodeTwo{1556-472X}%
 \or % TMIS
   \def\@journalName{ACM Transactions on Management Information Systems}%
   \def\@journalNameShort{ACM Trans. Manag. Inform. Syst.}%
   \def\@permissionCodeOne{2158-656X}%
+  \def\@permissionCodeTwo{2158-6578}%
 \or % TOCE
   \def\@journalName{ACM Transactions on Computing Education}%
   \def\@journalNameShort{ACM Trans. Comput. Educ.}%
   \def\@permissionCodeOne{1946-6226}%
+  \def\@permissionCodeTwo{1946-6226}%
 \or % TOCHI
   \def\@journalName{ACM Transactions on Computer-Human Interaction}%
   \def\@journalNameShort{ACM Trans. Comput.-Hum. Interact.}%
   \def\@permissionCodeOne{1073-0516}%
+  \def\@permissionCodeTwo{1557-7325}%
 \or % TOCL
   \def\@journalName{ACM Transactions on Computational Logic}%
   \def\@journalNameShort{ACM Trans. Comput. Logic}%
   \def\@permissionCodeOne{1529-3785}%
+  \def\@permissionCodeTwo{1557-945X}%
 \or % TOCS
   \def\@journalName{ACM Transactions on Computer Systems}%
   \def\@journalNameShort{ACM Trans. Comput. Syst.}%
   \def\@permissionCodeOne{0734-2071}%
+  \def\@permissionCodeTwo{1557-7333}%
 \or % TOCT
   \def\@journalName{ACM Transactions on Computation Theory}%
   \def\@journalNameShort{ACM Trans. Comput. Theory}%
   \def\@permissionCodeOne{1942-3454}%
+  \def\@permissionCodeTwo{1942-3462}%
 \or % TODAES
   \def\@journalName{ACM Transactions on Design Automation of Electronic Systems}%
   \def\@journalNameShort{ACM Trans. Des. Autom. Electron. Syst.}%
   \def\@permissionCodeOne{1084-4309}%
+  \def\@permissionCodeTwo{1557-7309}%
 \or % TODS
   \def\@journalName{ACM Transactions on Database Systems}%
   \def\@journalNameShort{ACM Trans. Datab. Syst.}%
   \def\@permissionCodeOne{0362-5915}%
+  \def\@permissionCodeTwo{1557-4644}%
 \or % TOG
   \def\@journalName{ACM Transactions on Graphics}%
   \def\@journalNameShort{ACM Trans. Graph.}%
-  \def\@permissionCodeOne{0730-0301}
+  \def\@permissionCodeOne{0730-0301}%
+  \def\@permissionCodeTwo{1557-7368}%
 \or % TOIS
   \def\@journalName{ACM Transactions on Information Systems}%
   \def\@journalNameShort{ACM Trans. Inf. Syst.}%
   \def\@permissionCodeOne{1046-8188}%
+  \def\@permissionCodeTwo{1558-2868}%
 \or % TOIT
   \def\@journalName{ACM Transactions on Internet Technology}%
   \def\@journalNameShort{ACM Trans. Internet Technol.}%
   \def\@permissionCodeOne{1533-5399}%
+  \def\@permissionCodeTwo{1557-6051}%
 \or % TOMACS
   \def\@journalName{ACM Transactions on Modeling and Computer Simulation}%
   \def\@journalNameShort{ACM Trans. Model. Comput. Simul.}%
@@ -4669,67 +4784,82 @@
   \def\@journalName{ACM Transactions on Modeling and Performance Evaluation of Computing Systems}%
   \def\@journalNameShort{ACM Trans. Model. Perform. Eval. Comput. Syst.}%
   \def\@permissionCodeOne{2376-3639}%
+  \def\@permissionCodeTwo{2376-3647}%
 \or % TOMS
   \def\@journalName{ACM Transactions on Mathematical Software}%
   \def\@journalNameShort{ACM Trans. Math. Softw.}%
   \def\@permissionCodeOne{0098-3500}%
+  \def\@permissionCodeTwo{1557-7295}%
 \or % TOPC
   \def\@journalName{ACM Transactions on Parallel Computing}%
   \def\@journalNameShort{ACM Trans. Parallel Comput.}%
   \def\@permissionCodeOne{2329-4949}%
   \def\@permissionCodeTwo{2329-4957}%
-\or % TOPS
-  \def\@journalName{ACM Transactions on Privacy and Security}%
-  \def\@journalNameShort{ACM Trans. Priv. Sec.}%
-  \def\@permissionCodeOne{2471-2566}%
 \or % TOPLAS
   \def\@journalName{ACM Transactions on Programming Languages and Systems}%
   \def\@journalNameShort{ACM Trans. Program. Lang. Syst.}%
   \def\@permissionCodeOne{0164-0925}%
+  \def\@permissionCodeTwo{1558-4593}%
 \or % TOPML
   \def\@journalName{ACM Transactions on Probabilistic Machine Learning}%
   \def\@journalNameShort{ACM Trans. Probab. Mach. Learn.}%
   \def\@permissionCodeOne{2836-8924}%
+  \def\@permissionCodeTwo{2836-8924}%
+\or % TOPS
+  \def\@journalName{ACM Transactions on Privacy and Security}%
+  \def\@journalNameShort{ACM Trans. Priv. Sec.}%
+  \def\@permissionCodeOne{2471-2566}%
+  \def\@permissionCodeTwo{2471-2574}%
 \or % TORS
   \def\@journalName{ACM Transactions on Recommender Systems}%
   \def\@journalNameShort{ACM Trans. Recomm. Syst.}%
   \def\@permissionCodeOne{2770-6699}%
+  \def\@permissionCodeTwo{2770-6699}%
 \or % TOS
   \def\@journalName{ACM Transactions on Storage}%
   \def\@journalNameShort{ACM Trans. Storage}%
   \def\@permissionCodeOne{1553-3077}%
+  \def\@permissionCodeTwo{1553-3093}%
 \or % TOSEM
   \def\@journalName{ACM Transactions on Software Engineering and Methodology}%
   \def\@journalNameShort{ACM Trans. Softw. Eng. Methodol.}%
   \def\@permissionCodeOne{1049-331X}%
+  \def\@permissionCodeTwo{1557-7392}%
 \or % TOSN
   \def\@journalName{ACM Transactions on Sensor Networks}%
   \def\@journalNameShort{ACM Trans. Sensor Netw.}%
   \def\@permissionCodeOne{1550-4859}%
+  \def\@permissionCodeTwo{1550-4867}%
 \or % TQC
   \def\@journalName{ACM Transactions on Quantum Computing}%
   \def\@journalNameShort{ACM Trans. Quantum Comput.}%
   \def\@permissionCodeOne{2643-6817}%
+  \def\@permissionCodeTwo{2643-6817}%
 \or % TRETS
   \def\@journalName{ACM Transactions on Reconfigurable Technology and Systems}%
   \def\@journalNameShort{ACM Trans. Reconfig. Technol. Syst.}%
   \def\@permissionCodeOne{1936-7406}%
+  \def\@permissionCodeTwo{1936-7414}%
 \or % TSAS
   \def\@journalName{ACM Transactions on Spatial Algorithms and Systems}%
   \def\@journalNameShort{ACM Trans. Spatial Algorithms Syst.}%
   \def\@permissionCodeOne{2374-0353}%
+  \def\@permissionCodeTwo{2374-0361}%
 \or % TSC
   \def\@journalName{ACM Transactions on Social Computing}%
   \def\@journalNameShort{ACM Trans. Soc. Comput.}%
   \def\@permissionCodeOne{2469-7818}%
+  \def\@permissionCodeTwo{2469-7826}%
 \or % TSLP
   \def\@journalName{ACM Transactions on Speech and Language Processing}%
   \def\@journalNameShort{ACM Trans. Speech Lang. Process.}%
   \def\@permissionCodeOne{1550-4875}%
+  \def\@permissionCodeTwo{2329-9304}%
 \or % TWEB
   \def\@journalName{ACM Transactions on the Web}%
   \def\@journalNameShort{ACM Trans. Web}%
   \def\@permissionCodeOne{1559-1131}%
+  \def\@permissionCodeTwo{1559-114X}%
 \else % FACMP, a dummy journal
   \def\@journalName{ACM Just Accepted}%
   \def\@journalNameShort{ACM Accepted}%
@@ -4745,23 +4875,28 @@
 % And the syntactic sugar around it
 %    \begin{macrocode}
 \def\acmJournal#1{\setkeys{ACM}{acmJournal=#1}%
-  \global\@ACM@journal@bibstriptrue}
+  \global\@ACM@journal@bibstriptrue
+  \global\@ACM@journal@bibstrip@or@togtrue}
 %    \end{macrocode}
 %
 % \end{macro}
 %
 % The defaults:
+% \changes{v2.04}{2024/03/17}{eISSN is printed, rather than pSSN}
 %    \begin{macrocode}
 \def\@journalCode@nr{0}
 \def\@journalName{}%
 \def\@journalNameShort{\@journalName}%
 \def\@permissionCodeOne{XXXX-XXXX}%
-\def\@permissionCodeTwo{}%
+\def\@permissionCodeTwo{\@permissionCodeOne}%
 %    \end{macrocode}
 %
 %
 % \begin{macro}{\acmConference}
 % \changes{v1.59}{2019/04/20}{Setting \cs{@ACM@journal@bibstrip}}
+% \changes{v2.02}{2024/01/06}{Moved here setting the conference title
+% for bibstrip}
+% \changes{v2.03}{2024/02/04}{Made setting bibstrip overriding journal}
 %   This is the conference command
 %    \begin{macrocode}
 \newcommand\acmConference[4][]{%
@@ -4773,6 +4908,11 @@
     \gdef\acmConference@shortname{#2}%
   \fi
   \global\@ACM@journal@bibstripfalse
+  \ifx\@acmBooktitle\@empty\relax
+    \acmBooktitle{Proceedings of \acmConference@name
+      \ifx\acmConference@name\acmConference@shortname\else
+      \ (\acmConference@shortname)\fi}%
+  \fi
 }
 \if@ACM@journal\else
 \acmConference[Conference'17]{ACM Conference}{July 2017}{Washington,
@@ -4784,17 +4924,14 @@
 %
 % \begin{macro}{\acmBooktitle}
 % \changes{v1.44}{2017/08/11}{Added macro}
+% \changes{v2.01}{2024/01/06}{Moved default conference title to
+% conference setting}
 % \begin{macro}{\@acmBooktitle}
 % \changes{v1.44}{2017/08/11}{Added macro}
 %   The book title of the conference:
 %    \begin{macrocode}
 \def\acmBooktitle#1{\gdef\@acmBooktitle{#1}}
 \acmBooktitle{}
-\ifx\acmConference@name\@undefined\else
-\acmBooktitle{Proceedings of \acmConference@name
-       \ifx\acmConference@name\acmConference@shortname\else
-       \ (\acmConference@shortname)\fi}
-\fi
 %    \end{macrocode}
 %
 % \end{macro}
@@ -4993,10 +5130,8 @@
   \def\institution##1{##1\ignorespaces}%
   \def\department{\@ifnextchar[{\@department}{\@department[]}}%
   \def\@department[##1]##2{\unskip, ##2\ignorespaces}%
-  \let\streetaddress\position
   \let\city\position
   \let\state\position
-  \let\postcode\position
   \let\country\position
   Also with #1\unskip.\egroup}
 %    \end{macrocode}
@@ -5220,12 +5355,13 @@
 % \end{macro}
 %
 % \begin{macro}{\acmPrice}
-%   The price
+% \changes{v2.00}{2023/10/22}{Deleted macro}
+% \changes{v2.01}{2023/12/29}{Now the macro produces a warning}
+% The price---obsolete
 %    \begin{macrocode}
-\def\acmPrice#1{\def\@acmPrice{#1}}
-\acmPrice{15.00}
+\def\acmPrice#1{\ClassWarning{\@classname}{The macro \string\acmPrice
+    is obsolete.  ACM no longer prints the price in bibstrip.}}
 %    \end{macrocode}
-%
 % \end{macro}
 %
 %
@@ -5758,6 +5894,8 @@
 % to iw3c2w3 or iw3c2w3g}
 % \changes{v1.51}{2018/04/05}{Corrected the bug with price suppression}
 % \changes{v1.85}{2022/05/08}{Added CC licenses}
+% \changes{v2.00}{2023/10/22}{Deleted acmPrice}
+% \changes{v2.00}{2023/10/22}{Deleted acmPrice}
 % Keys:
 %    \begin{macrocode}
 \define@choicekey*{ACM@}{acmcopyrightmode}[%
@@ -5779,13 +5917,11 @@
   \fi
   \ifnum\acm@copyrightmode=3\relax % rightsretained
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=4\relax % usgov
    \@printpermissiontrue
    \@printcopyrightfalse
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=6\relax % cagov
    \@acmownedfalse
@@ -5807,15 +5943,12 @@
   \fi
   \ifnum\acm@copyrightmode=13\relax % iw3c2w3
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=14\relax % iw3c2w3g
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi
   \ifnum\acm@copyrightmode=15\relax % cc
    \@acmownedfalse
-   \AtBeginDocument{\acmPrice{}}%
   \fi}
 %    \end{macrocode}
 %
@@ -5823,7 +5956,7 @@
 %   This is the syntactic sugar around setting keys.
 %    \begin{macrocode}
 \def\setcopyright#1{\setkeys{ACM@}{acmcopyrightmode=#1}}
-\setcopyright{acmcopyright}
+\setcopyright{acmlicensed}
 %    \end{macrocode}
 %
 % \end{macro}
@@ -5845,12 +5978,14 @@
 % licensedcagov}
 % \changes{v1.52}{2018/04/09}{Rewording of licenses}
 % \changes{v1.85}{2022/05/08}{Added CC licenses}
+% \changes{v2.00}{2023/10/22}{Changed wording}
+% \changes{v2.04}{2024/03/28}{Changed wording}
 %   Here is the owner of the copyright
 %    \begin{macrocode}
 \def\@copyrightowner{%
   \ifcase\acm@copyrightmode\relax % none
   \or % acmcopyright
-  Association for Computing Machinery.
+  ACM\@.
   \or % acmlicensed
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
@@ -5858,22 +5993,21 @@
   Copyright held by the owner/author(s).
   \or % usgov
   \or % usgovmixed
-  Association for Computing Machinery.
+  Copyright held by the owner/author(s).
   \or % cagov
-  Crown in Right of Canada.
+  Copyright Crown in Right of Canada.
   \or %cagovmixed
-  Association for Computing Machinery.
+  Copyright held by the owner/author(s).
   \or %licensedusgovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
   \or % licensedcagov
-  Crown in Right of Canada. Publication rights licensed to
-  ACM\@.
+  Copyright held by the owner/author(s). 
   \or %licensedcagovmixed
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
   \or % othergov
-  Association for Computing Machinery.
+  Copyright held by the owner/author(s). 
   \or % licensedothergov
   Copyright held by the owner/author(s). Publication rights licensed to
   ACM\@.
@@ -5902,28 +6036,9 @@
 %
 % \begin{macro}{\@ACM@copyright@check@cc}
 % \changes{v1.87}{2022/07/30}{Added macro}
-% At present cC licenses can be used only for acmengage format or for
-% non-acm stuff.  This macro checks whether the CC license is
-% applicable and generates an error if not.
-%    \begin{macrocode}
-\def\@ACM@copyright@check@cc{%
-  \if@ACM@nonacm
-     \ClassInfo{\@classname}{Using CC license with a non-acm
-       material}%
-  \else
-     \if@ACM@engage   
-        \ClassInfo{\@classname}{Using CC license with ACM Enage
-          material}%
-      \else
-      \ClassError{\@classname}{%
-        Sorry, Creative Commons licenses are\MessageBreak
-        currently not used with ACM publications\MessageBreak
-        typeset by the authors}{Please use nonacm 
-           option or ACM Engage class to enable CC licenses}%
-      \fi
-  \fi}
-%    \end{macrocode}
-% 
+% \changes{v2.00}{2023/10/22}{Moved to warning}
+% \changes{v2.09}{2024/08/25}{Deleted macro}
+% This macro is no longer needed due to the change in ACM policy.  
 % \end{macro}
 %
 % \begin{macro}{\@copyrightpermission}
@@ -5934,6 +6049,8 @@
 % \changes{v1.85}{2022/05/08}{Added CC licenses}
 % \changes{v1.87}{2022/07/30}{CC licenses now are allowed only for
 % non-acm or ACM engage publications}
+% \changes{v2.09}{2024/08/25}{Deleted checking whether CC licenses are
+% allowed}
 %   The canned permission block.
 %    \begin{macrocode}
 \def\@copyrightpermission{%
@@ -5945,10 +6062,10 @@
    advantage and that copies bear this notice and the full citation on
    the first page. Copyrights for components of this work owned by
    others than ACM must be honored. Abstracting with credit is
-   permitted. To copy otherwise, or republish, to post on servers or to
-   redistribute to lists, requires prior specific permission
-   and\hspace*{.5pt}/or  a fee. Request permissions from
-   permissions@acm.org.
+   permitted. To copy otherwise, or republish, to post on servers or
+   to redistribute to lists, requires prior specific permission
+   and\hspace*{.5pt}/or 
+   a fee. Request permissions from permissions@acm.org.
   \or % acmlicensed
    Permission to make digital or hard copies of all or part of this
    work for personal or classroom use is granted without fee provided
@@ -5956,97 +6073,102 @@
    advantage and that copies bear this notice and the full citation on
    the first page. Copyrights for components of this work owned by
    others than the author(s) must be honored. Abstracting with credit
-   is permitted.  To copy otherwise, or republish, to post on servers
-   or to  redistribute to lists, requires prior specific permission
-   and\hspace*{.5pt}/or  a fee. Request permissions from
-   permissions@acm.org.
+   is permitted. To copy otherwise, or republish, to post on servers
+   or to redistribute to lists, requires prior specific permission
+   and\hspace*{.5pt}/or a fee. Request permissions from
+   permissions@acm.org. 
   \or % rightsretained
-   Permission to make digital or hard copies of part or all of this work
-   for personal or classroom use is granted without fee provided that
-   copies are not made or distributed for profit or commercial advantage
-   and that copies bear this notice and the full citation on the first
-   page. Copyrights for third-party components of this work must be
-   honored. For all other uses, contact the
-   owner\hspace*{.5pt}/author(s).
+   Permission to make digital or hard copies of all or part of this
+   work for personal or classroom use is granted without fee provided
+   that copies are not made or distributed for profit or commercial
+   advantage and that copies bear this notice and the full citation on
+   the first page. Copyrights for third-party components of this work
+   must be honored. For all other uses, contact the
+   owner\hspace*{.5pt}/author(s). 
   \or % usgov
    This paper is authored by an employee(s) of the United States
    Government and is in the public domain. Non-exclusive copying or
    redistribution is allowed, provided that the article citation is
    given and the authors and agency are clearly identified as its
-   source.
+   source. All others Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % usgovmixed
    ACM acknowledges that this contribution was authored or co-authored
    by an employee, contractor, or affiliate of the United States
    government. As such, the United States government retains a
    nonexclusive, royalty-free right to publish or reproduce this
-   article, or to allow others to do so, for government purposes only.
+   article, or to allow others to do so, for government purposes
+   only. Request permissions from owner\hspace*{.5pt}/author(s). 
   \or % cagov
-   This article was authored by employees of the Government of Canada.
-   As such, the Canadian government retains all interest in the
-   copyright to this work and grants to ACM a nonexclusive,
-   royalty-free right to publish or reproduce this article, or to allow
-   others to do so, provided that clear attribution is given both to
-   the authors and the Canadian government agency employing them.
-   Permission to make digital or hard copies for personal or classroom
-   use is granted. Copies must bear this notice and the full citation
-   on the first page.  Copyrights for components of this work owned by
-   others than the Canadian Government must be honored. To copy
-   otherwise, distribute, republish, or post, requires prior specific
-   permission and\hspace*{.5pt}/or a fee. Request permissions from
-   permissions@acm.org.
+   This article was authored by employees of the Government of
+   Canada. As such, the Canadian government retains all interest in
+   the copyright to this work and grants to ACM a nonexclusive,
+   royalty-free right to publish or reproduce this article, or to
+   allow others to do so, provided that clear attribution is given
+   both to the authors and the Canadian government agency employing
+   them. Permission to make digital or hard copies for personal or
+   classroom use is granted. Copies must bear this notice and the full
+   citation on the first page. Copyrights for components of this work
+   owned by others than the Canadian Government must be honored. To
+   copy otherwise, distribute, republish, or post, requires prior
+   specific permission and/or a fee. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % cagovmixed
    ACM acknowledges that this contribution was co-authored by an
    affiliate of the national government of Canada. As such, the Crown
-   in Right of Canada retains an equal interest in the copyright.
-   Reprints must include clear attribution to ACM and the author's
-   government agency affiliation.  Permission to make digital or hard
-   copies for personal or classroom use is granted.  Copies must bear
-   this notice and the full citation on the first page. Copyrights for
-   components of this work owned by others than ACM must be honored.
-   To copy otherwise, distribute, republish, or post, requires prior
-   specific permission and\hspace*{.5pt}/or a fee. Request permissions
-   from permissions@acm.org.
+   in Right of Canada retains an equal interest in the
+   copyright. Reprints must include clear attribution to ACM and the
+   author’s government agency affiliation. Permission to make digital
+   or hard copies for personal or classroom use is granted. Copies
+   must bear this notice and the full citation on the first
+   page. Copyrights for components of this work owned by others than
+   ACM must be honored. To copy otherwise, distribute, republish, or
+   post, requires prior specific permission and/or a fee. Request
+   permissions from owner\hspace*{.5pt}/author(s). 
   \or % licensedusgovmixed
    Publication rights licensed to ACM\@. ACM acknowledges that this
    contribution was authored or co-authored by an employee, contractor
    or affiliate of the United States government. As such, the
    Government retains a nonexclusive, royalty-free right to publish or
    reproduce this article, or to allow others to do so, for Government
-   purposes only.
+   purposes only. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % licensedcagov
-   This article was authored by employees of the Government of Canada.
-   As such, the Canadian government retains all interest in the
-   copyright to this work and grants to ACM a nonexclusive,
-   royalty-free right to publish or reproduce this article, or to allow
-   others to do so, provided that clear attribution is given both to
-   the authors and the Canadian government agency employing them.
-   Permission to make digital or hard copies for personal or classroom
-   use is granted. Copies must bear this notice and the full citation
-   on the first page.  Copyrights for components of this work owned by
-   others than the Canadian Government must be honored. To copy
-   otherwise, distribute, republish, or post, requires prior specific
-   permission and\hspace*{.5pt}/or a fee. Request permissions from
-   permissions@acm.org.
+   This article was authored by employees of the Government of
+   Canada. As such, the Canadian government retains all interest in
+   the copyright to this work and grants to ACM a nonexclusive,
+   royalty-free right to publish or reproduce this article, or to
+   allow others to do so, provided that clear attribution is given
+   both to the authors and the Canadian government agency employing
+   them. Permission to make digital or hard copies for personal or
+   classroom use is granted. Copies must bear this notice and the full
+   citation on the first page. Copyrights for components of this work
+   owned by others than the Canadian Government must be honored. To
+   copy otherwise, distribute, republish, or post, requires prior
+   specific permission and/or a fee. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % licensedcagovmixed
-   Publication rights licensed to ACM\@. ACM acknowledges that this
+   Publication rights licensed to ACM. ACM acknowledges that this
    contribution was authored or co-authored by an employee, contractor
    or affiliate of the national government of Canada. As such, the
    Government retains a nonexclusive, royalty-free right to publish or
    reproduce this article, or to allow others to do so, for Government
-   purposes only.
+   purposes only. Request permissions from
+   owner\hspace*{.5pt}/author(s). 
   \or % othergov
    ACM acknowledges that this contribution was authored or co-authored
-   by an employee, contractor or affiliate of a national government. As
-   such, the Government retains a nonexclusive, royalty-free right to
-   publish or reproduce this article, or to allow others to do so, for
-   Government purposes only.
+   by an employee, contractor or affiliate of a national
+   government. As such, the Government retains a nonexclusive,
+   royalty-free right to publish or reproduce this article, or to
+   allow others to do so, for Government purposes only. Request
+   permissions from owner\hspace*{.5pt}/author(s). 
   \or % licensedothergov
    Publication rights licensed to ACM\@. ACM acknowledges that this
    contribution was authored or co-authored by an employee, contractor
    or affiliate of a national government. As such, the Government
    retains a nonexclusive, royalty-free right to publish or reproduce
    this article, or to allow others to do so, for Government purposes
-   only.
+   only. Request permissions from owner\hspace*{.5pt}/author(s). 
  \or % iw3c2w3
    This paper is published under the Creative Commons Attribution~4.0
    International (CC-BY~4.0) license. Authors reserve their rights to
@@ -6059,7 +6181,6 @@
    disseminate the work on their personal and corporate Web sites with
    the appropriate attribution.
  \or % CC
-   \@ACM@copyright@check@cc
    \IfEq{\ACM@cc@type}{zero}{%
      \def\ACM@CC@Url{https://creativecommons.org/publicdomain/zero/1.0/legalcode}}{%
   \edef\ACM@CC@Url{https://creativecommons.org/licenses/\ACM@cc@type/\ACM@cc@version/legalcode}}%
@@ -6248,7 +6369,11 @@
 % \changes{v1.76}{2021/04/05}{Put \cs{par} inside group for keywords}
 % \changes{v1.83}{2022/02/20}{I13n}
 % \changes{v1.85}{2022/05/08}{acmengage}
-% \changes{v1.87}{2022/07/30}{CC license are allowed for non-acm publications}
+% \changes{v1.87}{2022/07/30}{CC license are allowed for non-acm
+% publications}
+% \changes{v2.00}{2023/10/24}{Deleted acmPrice}
+% \changes{v2.00}{2023/11/05}{Added ``ACM'' for papers}
+% \changes{v2.03}{2024/12/04}{Special processing for conferences in TOG}
 %   The (in)famous \cs{maketitle}.  Note that in |sigchi-a| mode, authors
 %   are \emph{not} in the title box.
 %
@@ -6289,7 +6414,7 @@
   \if@ACM@acmcp\else
     \ifx\@empty\@authorsaddresses\else
        \if@ACM@anonymous\else
-         \if@ACM@journal@bibstrip
+         \if@ACM@journal@bibstrip@or@tog
            \footnotetextauthorsaddresses{%
              \def\par{\let\par\@par}\parindent\z@\@setauthorsaddresses}%
          \fi
@@ -6346,12 +6471,10 @@
         \else
           \if@ACM@nonacm\else
             \if@ACM@journal@bibstrip
-              \@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle
-              \ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\
+              ACM~\@permissionCodeTwo/\@acmYear/\@acmMonth-ART\@acmArticle\\
               \@formatdoi{\@acmDOI}%
             \else % Conference
-              \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN
-              \ifx\@acmPrice\@empty.\else\dots\$\@acmPrice\fi\\\fi
+              \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN\\\fi
               \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi%
             \fi
           \fi
@@ -6389,7 +6512,7 @@
     pdfsubject={\@concepts},
     pdfkeywords={\@keywords},
     pdfcreator={LaTeX with acmart
-      \csname ver@acmart.cls\endcsname\space
+      \csname ver@\@classname.cls\endcsname\space
       and hyperref
       \csname ver@hyperref.sty\endcsname}}%
   \andify\authors
@@ -6784,6 +6907,8 @@
 % \changes{v1.15}{2016/07/03}{Added macro}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
 % \changes{v1.40}{2017/06/15}{We now do not print this even in SIG}
+% \changes{v2.06}{2024/04/13}{We now do not collect postal information
+% anymore}
 % \begin{macro}{\city}
 % \changes{v1.15}{2016/07/03}{Added macro}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
@@ -6797,6 +6922,8 @@
 % \changes{v1.15}{2016/07/03}{Added macro}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
 % \changes{v1.40}{2017/06/15}{We now do not print this even in SIG}
+% \changes{v2.06}{2024/04/13}{We now do not collect postal information
+% anymore}
 % \begin{macro}{\country}
 % \changes{v1.15}{2016/07/03}{Added macro}
 % \changes{v1.33}{2017/03/28}{Added obeypunctuation code}
@@ -6810,8 +6937,12 @@
 %   strange error if an author uses them outside \cs{affiliation}.  Of
 %   course we can make them produce an error message, but\ldots
 %    \begin{macrocode}
-\def\streetaddress#1{\unskip\ignorespaces}
-\def\postcode#1{\unskip\ignorespaces}
+\def\streetaddress#1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your street
+  address}\unskip\ignorespaces} 
+\def\postcode#1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your postal
+  code}\unskip\ignorespaces} 
 \if@ACM@journal
   \def\position#1{\unskip\ignorespaces}
   \def\institution#1{\global\@ACM@instpresenttrue
@@ -6829,10 +6960,8 @@
     \if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}%
   \newcommand\department[2][0]{\if@ACM@affiliation@obeypunctuation
     #2\else#2\par\fi}%
-%  \def\streetaddress#1{\if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}%
   \def\city#1{\global\@ACM@citypresenttrue\@ACM@addtoaddress{#1}}%
   \let\state\@ACM@addtoaddress
-%  \def\postcode#1{\if@ACM@affiliation@obeypunctuation#1\else\unskip\space#1\fi}%
   \def\country#1{\global\@ACM@countrypresenttrue\@ACM@addtoaddress{#1}}%
 \fi
 %    \end{macrocode}
@@ -7276,16 +7405,21 @@
 % \changes{v1.46}{2017/08/27}{Introduced macro}
 % \changes{v1.65}{2019/10/13}{Deleted cs{@addpunct}}
 % \changes{v1.77}{2021/04/16}{New separator of institutions}
+% \changes{v2.06}{2024/04/13}{\cs{streetaddress} and \cs{postcode} now
+% produce warnings}
 % Typesetting authors' addresses in the footnote style
 %    \begin{macrocode}
 \def\@mkauthorsaddresses{%
   \ifnum\num@authors>1\relax
   Authors' \else Author's \fi
-  \ifnum\num@authorgroups>1\relax
-  addresses: \else address: \fi
+  Contact Information:
   \bgroup
-  \def\streetaddress##1{\unskip, ##1}%
-  \def\postcode##1{\unskip, ##1}%
+  \def\streetaddress##1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your street
+  address}\unskip\ignorespaces}% 
+  \def\postcode##1{\ClassWarning{\@classname}{ACM no longer collects
+  authors' postal addresses.  I am ignoring your postal
+  code}\unskip\ignorespaces}%
   \def\position##1{\unskip\ignorespaces}%
   \gdef\@ACM@institution@separator{, }%
   \def\institution##1{\unskip\@ACM@institution@separator ##1\gdef\@ACM@institution@separator{ and }}%
@@ -7495,6 +7629,18 @@
 % 
 % \end{macro}
 %
+%<*tagged>
+% We stop tagging inside maketitle for now.  Ulrike's code again.
+%    \begin{macrocode}
+\ExplSyntaxOn
+\AddToHook{cmd/maketitle/before}
+ {\tagstructbegin{tag=Title}\tagmcbegin{} \tag_stop:}
+\AddToHook{cmd/maketitle/after}
+ {\tag_start:\tagmcend\tagstructend }
+\ExplSyntaxOff
+%    \end{macrocode}
+%</tagged>
+%
 %\subsection{Headers and Footers}
 %\label{sec:head_foot}
 %
@@ -7686,6 +7832,7 @@
 % \changes{v1.86}{2022/06/26}{Special treatment of ACM Engage materials}
 % \changes{v1.87}{2022/08/14}{Special treatment of ACMCP}
 % \changes{v1.91}{2023/06/22}{Redesigned ACMP labels}
+% \changes{v2.03}{2024/02/04}{Special treatment of ACM TOG}
 %   The page style for all pages but the first one
 %    \begin{macrocode}
 \AtBeginDocument{%
@@ -7700,7 +7847,7 @@
       \@acmArticle\if@ACM@printfolios:\thepage\fi%
     \fi%
   }%
-  \if@ACM@journal@bibstrip
+  \if@ACM@journal@bibstrip@or@tog
     \ifcase\ACM@format@nr
     \relax % manuscript
       \fancyhead[LE]{\ACM@linecountL\if@ACM@printfolios\thepage\fi}%
@@ -7736,9 +7883,15 @@
       \fancyhead[RE]{\ACM@linecountR}%
       \fancyhead[RO]{\@headfootfont
         \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM@linecountR}%
-      \if@ACM@nonacm\else%
-        \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
-        \@acmNumber, Article \@acmArticle.  Publication date: \@acmPubDate.}%
+      \if@ACM@nonacm\else
+        \if@ACM@journal@bibstrip
+          \fancyfoot[RO,LE]{\footnotesize \@journalNameShort,
+            Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle.
+            Publication date: \@acmPubDate.}%
+        \else
+          \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname,
+            \acmConference@date, \acmConference@venue.}%
+         \fi
       \fi
     \else % Proceedings
       \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
@@ -7817,33 +7970,14 @@
 % \end{macro}
 %
 % \begin{macro}{\@folio@wd}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 % \begin{macro}{\@folio@ht}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 % \begin{macro}{\@folio@voffset}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 % \begin{macro}{\@folio@max}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 %   Folio blob width, height, offsets and max number
-%    \begin{macrocode}
-\newdimen\@folio@wd
-\@folio@wd=\z@
-\newdimen\@folio@ht
-\@folio@ht=\z@
-\newdimen\@folio@voffset
-\@folio@voffset=\z@
-\def\@folio@max{1}
-\ifcase\ACM@format@nr
-\relax % manuscript
-\or % acmsmall
-  \@folio@wd=45.75pt\relax
-  \@folio@ht=1.25in\relax
-  \@folio@voffset=.2in\relax
-  \def\@folio@max{8}
-\or % acmlarge
-  \@folio@wd=43.25pt\relax
-  \@folio@ht=79pt\relax
-  \@folio@voffset=.55in\relax
-  \def\@folio@max{10}
-\fi
-%    \end{macrocode}
-%
 % \end{macro}
 % \end{macro}
 % \end{macro}
@@ -7853,36 +7987,8 @@
 % \changes{v1.44}{2017/08/11}{Suppress the blob if acmArticleSeq is empty}
 % \changes{v1.45}{2017/08/15}{Switched \cs{bfeseries}\cs{sffamily} to
 % \cs{sffamily}\cs{bfseries}}
+% \changes{v2.00}{2023/10/22}{Obsoleted macro}
 %   The macro to typeset the folio blob.
-%    \begin{macrocode}
-\def\@folioblob{\@tempcnta=0\@acmArticleSeq\relax
-  \ifnum\@tempcnta=0\relax\else
-%    \end{macrocode}
-% First, we calculate \cs{@acmArticleSeq} modulo \cs{@folio@max}
-%    \begin{macrocode}
-  \loop
-     \ifnum\@tempcnta>\@folio@max\relax
-      \advance\@tempcnta by - \@folio@max
-   \repeat
-%    \end{macrocode}
-%
-%    \begin{macrocode}
-    \advance\@tempcnta by -1\relax
-    \@tempdima=\@folio@ht\relax
-    \multiply\@tempdima by \the\@tempcnta\relax
-    \advance\@tempdima by -\@folio@voffset\relax
-    \begin{picture}(0,0)
-    \makebox[\z@]{\raisebox{-\@tempdima}{%
-        \rlap{%
-          \raisebox{-0.45\@folio@ht}[\z@][\z@]{%
-            \rule{\@folio@wd}{\@folio@ht}}}%
-        \parbox{\@folio@wd}{%
-          \centering
-          \textcolor{white}{\LARGE\sffamily\bfseries\@acmArticle}}}}
-  \end{picture}\fi}
-
-%    \end{macrocode}
-%
 %
 % \end{macro}
 %
@@ -7899,6 +8005,8 @@
 % \changes{v1.59}{2019/04/20}{Moved page styles to \cs{AtBeginDocument}}
 % \changes{v1.87}{2022/08/14}{Special treatment for acmcp}
 % \changes{v1.89}{2022/12/27}{Moved badges here}
+% \changes{v2.00}{2023/10/22}{Deleted blobs}
+% \changes{v2.03}{2024/02/04}{Special treatment of tog}
 %   The page style for the first page only.
 %    \begin{macrocode}
 \AtBeginDocument{%
@@ -7906,7 +8014,7 @@
   \fancyhf{}%
   \renewcommand{\headrulewidth}{\z@}%
   \renewcommand{\footrulewidth}{\z@}%
-  \if@ACM@journal@bibstrip
+  \if@ACM@journal@bibstrip@or@tog
     \ifcase\ACM@format@nr
     \relax % manuscript
       \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
@@ -7921,27 +8029,30 @@
         \@acmNumber, Article \@acmArticle.  Publication date:
         \@acmPubDate.}%
       \fi%
-      \fancyhead[LE]{\ACM@linecountL\@folioblob\@acmBadgeL}%
+      \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}%
       \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}%
-      \fancyhead[RO]{\@acmBadgeR\@folioblob}%
+      \fancyhead[RO]{\@acmBadgeR}%
       \fancyhead[RE]{\@acmBadgeR}%
-      \fancyheadoffset[RO,LE]{0.6\@folio@wd}%
     \or % acmlarge
       \if@ACM@nonacm\else%
         \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
         \@acmNumber, Article \@acmArticle.  Publication date:
         \@acmPubDate.}%
       \fi%
-      \fancyhead[RO]{\@acmBadgeR\@folioblob}%
+      \fancyhead[RO]{\@acmBadgeR}%
       \fancyhead[RE]{\@acmBadgeR}%
-      \fancyhead[LE]{\ACM@linecountL\@folioblob\@acmBadgeL}%
+      \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}%
       \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}%
-      \fancyheadoffset[RO,LE]{1.4\@folio@wd}%
     \or % acmtog
       \if@ACM@nonacm\else%
-        \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
-        \@acmNumber, Article \@acmArticle.  Publication date:
-        \@acmPubDate.}%
+        \if@ACM@journal@bibstrip
+          \fancyfoot[RO,LE]{\footnotesize \@journalNameShort,
+            Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle.
+            Publication date: \@acmPubDate.}%
+        \else
+          \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname,
+            \acmConference@date, \acmConference@venue.}%
+         \fi
       \fi%
       \fancyhead[L]{\ACM@linecountL\@acmBadgeL}%
       \fancyhead[R]{\@acmBadgeR\ACM@linecountR}%
@@ -8071,28 +8182,33 @@
 % \changes{v1.69}{2020/02/02}{No dots for unindented paragraphs}
 %   Sectioning is different for different levels
 %    \begin{macrocode}
-\renewcommand\section{\@startsection{section}{1}{\z@}%
+\renewcommand\section{\def\@toclevel{1}%
+  \@startsection{section}{1}{\z@}%
   {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {.25\baselineskip}%
   {\ACM@NRadjust\@secfont}}
-\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+\renewcommand\subsection{\def\@toclevel{2}%
+  \@startsection{subsection}{2}{\z@}%
   {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {.25\baselineskip}%
   {\ACM@NRadjust\@subsecfont}}
-\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+\renewcommand\subsubsection{\def\@toclevel{3}%
+  \@startsection{subsubsection}{3}{\z@}%
   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {-3.5\p@}%
   {\ACM@NRadjust{\@subsubsecfont\@adddotafter}}}
-\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}%
+\renewcommand\paragraph{\def\@toclevel{4}%
+  \@startsection{paragraph}{4}{\parindent}%
   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {-3.5\p@}%
   {\ACM@NRadjust{\@parfont\@adddotafter}}}
-\newcommand\noindentparagraph{\@startsection{paragraph}{4}{\z@}%
+\newcommand\noindentparagraph{\def\@toclevel{4}%
+  \@startsection{paragraph}{4}{\z@}%
   {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
   {-3.5\p@}%
   {\ACM@NRadjust{\@parfont}}}
-
-\renewcommand\part{\@startsection{part}{9}{\z@}%
+\renewcommand\part{\def\@toclevel{9}%
+  \@startsection{part}{9}{\z@}%
   {-10\p@ \@plus -4\p@ \@minus -2\p@}%
   {4\p@}%
   {\ACM@NRadjust\@parfont}}
@@ -8122,9 +8238,10 @@
 % \cs{sffamily}\cs{bfseries}}
 % \changes{v1.67}{2020/01/11}{Deleted redefinitions of sections}
 % \changes{1.85}{2022/05/08}{Added: acmengage}
+% \changes{2.08}{2024/05/27}{Deleted uppercasing}
 % Fonts for sections etc. are different for different formats.
 %    \begin{macrocode}
-\def\@secfont{\sffamily\bfseries\section@raggedright\MakeTextUppercase}
+\def\@secfont{\sffamily\bfseries\section@raggedright}
 \def\@subsecfont{\sffamily\bfseries\section@raggedright}
 \def\@subsubsecfont{\sffamily\itshape}
 \def\@parfont{\itshape}
@@ -8133,16 +8250,16 @@
 \relax % manuscript
 \or % acmsmall
 \or % acmlarge
- \def\@secfont{\sffamily\large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\large\section@raggedright}
  \def\@subsecfont{\sffamily\large\section@raggedright}
 \or % acmtog
- \def\@secfont{\sffamily\large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\large\section@raggedright}
  \def\@subsecfont{\sffamily\large\section@raggedright}
 \or % sigconf
- \def\@secfont{\bfseries\Large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\bfseries\Large\section@raggedright}
  \def\@subsecfont{\bfseries\Large\section@raggedright}
 \or % siggraph
- \def\@secfont{\sffamily\bfseries\Large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\bfseries\Large\section@raggedright}
  \def\@subsecfont{\sffamily\bfseries\Large\section@raggedright}
 \or % sigplan
  \def\@secfont{\bfseries\Large\section@raggedright}
@@ -8152,14 +8269,14 @@
  \def\@subparfont{\itshape}
 \or % sigchi
  \setcounter{secnumdepth}{1}
- \def\@secfont{\sffamily\bfseries\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\bfseries\section@raggedright}
  \def\@subsecfont{\sffamily\bfseries\section@raggedright}
 \or % sigchi-a
  \setcounter{secnumdepth}{0}
- \def\@secfont{\sffamily\bfseries\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\sffamily\bfseries\section@raggedright}
  \def\@subsecfont{\sffamily\bfseries\section@raggedright}
 \or % acmengage
- \def\@secfont{\bfseries\Large\section@raggedright\MakeTextUppercase}
+ \def\@secfont{\bfseries\Large\section@raggedright}
  \def\@subsecfont{\bfseries\Large\section@raggedright}
 \or %acmcp
 \fi
diff --git a/acmart.ins b/acmart.ins
index d17dc06..95c1596 100644
--- a/acmart.ins
+++ b/acmart.ins
@@ -13,6 +13,7 @@
 
 \generate{%
   \file{acmart.cls}{\from{acmart.dtx}{class}}
+  \file{acmart-tagged.cls}{\from{acmart.dtx}{class,tagged}}
 }
 
 \obeyspaces