refactored for inclusion of windows hosts