@nmdguerreiro comments and review