Updated functions and UI