Optimization
Changes for ptimization