Added more partials in