Now tested on Windows