update todo
closures usage example: we need to simplify it