Apply Sylvain's changes