Modified Random gen option, will fix better in IDE