Added some plots post bug fix