Final refacturing

Final refacturing