Bringing the analysis code up to speed