Replace and upgrade hardware

Replace and upgrade hardware