updated for new generator format