Changed the hierarchy of the distribution