conf changes pass 1