Updated for new hardware deployments.