Edit Device #586