Improve the DY Gen finding