Work on improved plotting