updated todo
 merged 2 different commits