fixed matei's comments