change some var and add analyse