adjustment according to comments