Finalized the merge with Cedric's commit