More HW changes