Rev: 02 without length-matching