Update Setting UP according to doc meeting