Made some more updates smarter