More Optimizations. Thanks batman!