API and UI changes