He has refined his thinking: he wants Canada and Mexico to build (and pay for) a wall to keep people and drugs out of the US.