From diff-line 135 to diff-line 180 it looks as the whole code fragment has been changed. Is that the case?