All devices now supported

Merge if necessary