Upated TODO with new idea.