Still trying to fix d3