updated for device ID thingy that broke my stuff