Updated plot - rebuild to remove some more of the d3 obtuseness