Updated to make the beta work with more devices