Coronavirus & service update

Focus on this