D3 improvements