Make update process smarter