Reworked distribution functions