more work on EpicGenerator