Analysis updated (not tested)