Updated Closure to latest ToT.