Final version on the code side

.