Updated for Windows
altered for windows