Reorganize Random and add canonical distribution