updated plotting macros