More Efficiency
Merged and Fixed Conflict