Integrate Dominique changes