Works on Windows now