Added plotting...
Fixed plotting ?