big improvement of Walter's pipeline