changes for ui
merge