Additional cutouts + flow changes