* Implementing new UX provided by David.