added new devices
added new devices
merged