Device reporter draft2

Shouldn't be switched according to the previous comment?