Update Hardware and software (needs fixing)