Add correct random functions