Changes requested by nacho.