Added better plotting