Made the random generation more obvious