Improving plotting