added multiple devices, emails, etc support