Substatntial redesign of histogram classes