changed in UI implementation