Make it smarter!