Further reworked the connections and couplings.