Edit Device #1603