Improvements for close