updated, but not with the papers from eric + xavier lorca