Update for HW assignment