72 [Sophie] refactoring the partials more