Before histogram refactor
Histogram upgrades (broken right now)