improved support for multiple devices