Update to work on Windows