Better handle partials, actually how the documentation describes it.