Reduced dist size by 1/2 (down to 6mb again)