Updated to match new HW
resolved conflict