Updated to CloseNotifier