update UI correctly.
done correctly.