worked on the UI