secondpass hopefully done