Improved dist task