Updated mcgenerator engine