change some fun to private