Arya: few midifications
Arya: final version