2nd pass changes