Updating to work on Windows