Improve version of the automatic analysis scripts