Tweaked a few things for tad bit of speed