Improved the behaviour of the randomness