Update based on pr comments