MANUELLI: Adding an intermediate commit on hw.