Improved dist pipeline