Minor change in update logic to reduce loop calcs