Reformat and only one update func