finish up first pass