New HW. Also some reorg