update analysis code to work with new parser