Generator now works for Windows