Use more partials