* Refactor plot 2
* Added working code for plot 3