added some Random, meets more specificatios