updated macros and configures