updated analysis to work on new languages