use improved sharedUi api
merge