XP Fix
Cleaned up Updater Code