Marked Fix
Adjusted FoxxGenerator