merge d3 branch for frontend