--> Final version