New Deleglise-Rivat implementation
Refactoring