updates due to HW changes