Done all that. I'll upgrade to Win 10 and see what happens.