Adding more partials and minor tweakings