Added plotting capability