Switched to histogram based measurement