Can we make this smarter?