Improved histogram counter.
Fixed conflicts.
Fixed conflicts.