Move to new generator