Continued work of adaption scripts to the new hardware