Updated plot codes