Swapped in Geng's D3 implementation