macros/DEFINE added