Rearranged call-pattern for body update