still simplifying the UI code