add Nicolas' changes