Made last changes to take in account new information about the HW