same goes for the UI change