Added leakages.
Tweaked.