Got rid of randomness in TODO.