caught up
add device identification, cut down on duplication