Structural changes plus new optimizator used