added remaining subgenerators