found a few more device level components being added out of scope.