update after comments on pr .2