Commiting version 2 of analytics code, with approximate diameter