Changes based on CR feedback