switch to WithAngleAndTemplate	

this replaces PR#3484