Merge my previous change with Francis and Albin's

Merge my previous change with Francis and Albin's