Partials reworked.