Update logic And UI