Refinement. Better updating and UI details.