Added plotting and saving figures