Added more matplotlib plotting