Add Silviu's contributions.