update to convenience macros