added support for all devices