Reworked generators