Update to live values and changed user flow