added plot function
merge conflict resolved