removed plotting
merge, removed plotting