Smarter smart close