Added support for 2 devices