update with CR feedback