Removed TODO from the prototype.