first tranche of edit to line 118