change some withs