Hist maker works, pretty sure, also fixed # produced