@javivf merged in to the repo of specs: