Added Optimizations