improved flow, better generator