Modify device (12/17)

Modify device