the working version
Merge test

to make things work