Another attempt to fix matching and confusions about the delay line.