change some excluding and stuff