Optimization enhaced