First working version after the merge