Trying to make things smarter