updated config and added macros