Move update logic from old implementation to new modal UI.
Move update logic from old implementation to new modal UI.

machawk1/wail,machawk1/wail,machawk1/wail,machawk1/wail,machawk1/wail,machawk1/wail,machawk1/wail,machawk1/wail