Updated closure version