added new devices
fixed conflict