Made TODO better.