performance values are much better than before, make test passing