Added all new HW-ES