Lots of updates for new hardware revision