Address Prashant and Matei's comments