change some conditions