update and simplify distribution assembly