new version of plot macros