Updated for multiple devices