moved to macros from .sty