Switching over to new generator