Smarter check