editing devices now works.
editing devices now works.
merge