added another todo, minor improvement.