Changed plotting mechanism