added plotting macros
added plotting macros