Updated todo, changed name