merge in hardware.t