Simplify Update()