use d3 directly
small changes