Rev: v02 without length-matching