match tools and analysis code update