Changed to newer auto-generate script