Add big optimization of code