Fixed merged and optimized