Hardware repair and updates

Hardware repair and updates