Revamped partials for more consistency