Completely changed generator.