Updates by Pablo Rigual