Yes, and reduce stat_dict size