Adjusted promises and UI.