change some to make map better.