change some parsing