Add @tarruda's clarifications