updated macros from CERN