Oki it seems to work. Need to check it thoroughly :)
Forget to comment a testing line...