Updated for windows version changes