improvements to analyse