plotting macros updated