Change types to prepare for 2d histograms