updated generator for Windows