Tweaked for speed