Made the answer checking smarter.