Added other devices (not working yet)