changes to make things smarter