Updated multiple-device code from Ted.
2 files changed