Update Logic on 2nd pass