Address Ity's CR feedback