Updated to include D3's Changes

.. from 4 months ago. Oops.