Changed order in Update()