Address Matei's comments