updating generator to work with changed NoPL code