Modified plot macros