added and fixed randomness
removed