Fix/random

don't merge.