Added last bit of plotting