Added complex partials.
Tweaking.