Added working new generator, doesn't do nothing yet