first attempt at plot
fixed merge conflict