Smarter modification