Added Optimizaitons