Updates from main Laurent and Stephen