Errors correction + Optimization