Modify device (6/17)

Modify device