Merge gael's changes