Tweaked for compression