Updated Heterogeneous Generator

Mimics the EC-2013 paper of Ashlagi et al.