changes, with significant improvements to distribution shepherd