Refactoring :+1:, alter C2 const to more probabilistic random number, #2