Your TODO confused me a lot, can you push a new changed with the updated comment in this diff. That'd be great!