Optimizied added