Updated to assemble