Plotting macro updated