d3 added, objects revamped