Smarter closing, cat values added in