Updating to the new generator, less messy