Increase Performance and optimization source code
Fix code post merge