begin support of multiple devices for #13