TODO added

Read TODO and correct