Final Version

* Add more Devices
* Need "$"