adding plotting
fixing merge conflict