cleaned up the code : no more 'analyse'