Improvements in comparison with all. Solve part of #110