additional macros but untested!