fix: 7308 exactly
enh: new noodle generation code