change some for new ui