Active Generator
Fixes