+ Improved update script that handles much more cases