Changes based on Matei's comment