Changed Analyse_way() parameters