removed TODO, that is so minor leagues