Modified to use Discovery (when using multiple UPS)