Updated for latest D3 Software