2nd pass at urls