Updated to work currectly on Win XP