Added subplots and figure saving