UPDATE: completion of tasks

First attempt of merging