add more for close code