Make it smarter