Changes based on hardware testing. In progress but all tests ok.