Tackled the last comments from Manuel