Kinda fix simple generate Needs More Testing