Tried a few additional optimizations