Updated closure to latest ToT