Use new Close helpers.