Updated TODO(again)