Added a justplot option