[enh] 2nd pass