REviewed cr changes